Merge branch 'gabshr' into dayana

3 files changed, 14 insertions, 6 deletions

diff --git a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js
index 2f9862e..5110566 100644
--- a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js
+++ b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js
@@ -6,7 +6,7 @@ import { Paper, Typography } from '@material-ui/core';
 import { connect } from 'react-redux';
 
 //actions
-import { getPedidos } from 'ba-actions/pedido';
+import { getCamiones } from 'ba-actions/camion';
 
 const styles = ({
     root: {
@@ -21,11 +21,12 @@ class CamionTab extends Component {
     this.state = {
       dataRealF: []
     };
-    this.props.dispatch(getPedidos()).then((res) => {
+    this.props.dispatch(getCamiones()).then((res) => {
       if (res) {
           this.setState({
             dataRealF: res.data,
           });
+          console.log("Vengo del back", res.data)
       }
     })
   }
diff --git a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js
index 5a1783c..11c0805 100644
--- a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js
+++ b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js
@@ -72,7 +72,7 @@ class CrudCamionTab extends Component {
           <CrudTableForm
             dataTable={dataTable}
             openForm={openForm}
-            dataInit={dataApi}
+            dataInit={dataReal}
             anchor={anchorTable}
             title={title}
             fetchData={fetchData}
diff --git a/front/odiparpack/app/containers/Odipar/Simulacion/SimulacionMain.js b/front/odiparpack/app/containers/Odipar/Simulacion/SimulacionMain.js
index 616fab8..b9447d8 100644
--- a/front/odiparpack/app/containers/Odipar/Simulacion/SimulacionMain.js
+++ b/front/odiparpack/app/containers/Odipar/Simulacion/SimulacionMain.js
@@ -13,6 +13,11 @@ const styles = ({
     field: {
         width: '70%',
         marginBottom: 20
+    },
+    divider:{
+      ".MuiDivider-inset": {
+        marginLeft:"72px"
+      }
     }
   });
 
@@ -44,9 +49,9 @@ class SimulacionMain extends Component {
             <div>  
               <Paper className={classes.root}>
                 <Grid container>
-                    <Grid item xs={12} sm={5} >
+                    <Grid item xs={12} sm={4} >
                         <Typography variant="h6">
-                            {`Datos generales`}
+                            Datos generales
                         </Typography>
                         <form>
                             <div>
@@ -75,7 +80,9 @@ class SimulacionMain extends Component {
                             </div>
                         </form>
                     </Grid>
-                    <Divider variant="inset" style={{color:'black'}}/>
+                    <Grid item xs={12} sm={1} >
+                      <Divider orientation="vertical" flexItem variant="inset" style={{ marginLeft:"10px"}}/>
+                    </Grid>
                     <Grid item xs={12} sm={7}>
                         <Typography variant="h6">
                             {`Pedidos`}