diff options
Diffstat (limited to 'front/odiparpack')
9 files changed, 84 insertions, 11 deletions
diff --git a/front/odiparpack/app/actions/actionTypes.js b/front/odiparpack/app/actions/actionTypes.js index 8fd305f..11884c0 100644 --- a/front/odiparpack/app/actions/actionTypes.js +++ b/front/odiparpack/app/actions/actionTypes.js @@ -90,4 +90,6 @@ export const OPEN_MESSAGE = 'OPEN_MESSAGE'; //Odi Pedido export const LISTA_PEDIDO = 'LISTA_PEDIDO'; //Odi Almacen -export const LISTA_ALMACEN = 'LISTA_ALMACEN';
\ No newline at end of file +export const LISTA_ALMACEN = 'LISTA_ALMACEN'; +//Odi Camion +export const LISTA_CAMION = 'LISTA_CAMION'; diff --git a/front/odiparpack/app/actions/camion.js b/front/odiparpack/app/actions/camion.js new file mode 100644 index 0000000..6fdd2c6 --- /dev/null +++ b/front/odiparpack/app/actions/camion.js @@ -0,0 +1,39 @@ +import { + getCamionAPI +} from 'ba-api/camion'; +import * as types from './actionTypes' + +export const setCamiones = (payload) => ({ + type: types.LISTA_PEDIDO, + payload +}); + +/***************************************/ +export function b2fCamiones(x){ + const {...other} = x + return { + id: x.id, + codigo: 'A001', + placa: x.placa, + origen: 'Lima', + tipo: x.tipoCamion.nombre, + estado: x.estado, + capacidad: x.tipoCamion.capacidad, + ...other + } +} + +/***************************************/ + +export const getCamiones = () => async dispatch => { + try{ + const res = await getCamionAPI(); + res.data.forEach((x, i) => { + res.data[i] = b2fCamiones(x) + }); + dispatch(setCamiones({res})) + return res; + }catch(e){ + console.log(e) + } +} diff --git a/front/odiparpack/app/api/camion.js b/front/odiparpack/app/api/camion.js new file mode 100644 index 0000000..8229bbf --- /dev/null +++ b/front/odiparpack/app/api/camion.js @@ -0,0 +1,6 @@ +import { apiGet } from '../utils/odipar/api'; + +//GET APIS +export const getCamionAPI = async () => { + return await apiGet(`camion/`) +} diff --git a/front/odiparpack/app/components/Tables/CrudTableForm.js b/front/odiparpack/app/components/Tables/CrudTableForm.js index 8b7e6d5..017a3fc 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/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`} diff --git a/front/odiparpack/app/redux/modules/camion.js b/front/odiparpack/app/redux/modules/camion.js new file mode 100644 index 0000000..5cfe7d8 --- /dev/null +++ b/front/odiparpack/app/redux/modules/camion.js @@ -0,0 +1,16 @@ +import { LISTA_CAMION } from 'ba-actions/actionTypes'; + +const initState = { + camiones : [] +} + +const camion = (state = initState, action) => { + switch (action.type) { + case LISTA_CAMION: + return { ...state, camiones: action.payload } + default : + return state + } +} + +export default camion;
\ No newline at end of file diff --git a/front/odiparpack/app/redux/reducers.js b/front/odiparpack/app/redux/reducers.js index 0501270..9675be8 100644 --- a/front/odiparpack/app/redux/reducers.js +++ b/front/odiparpack/app/redux/reducers.js @@ -24,6 +24,7 @@ import initval from './modules/initForm'; import pedido from './modules/pedido'; import message from './modules/message' import almacen from './modules/almacen'; +import camion from './modules/camion' /** * Branching reducers to use one reducer for many components @@ -68,6 +69,7 @@ export default function createReducer(injectedReducers) { crudRuta: branchReducer(crudTableForm, 'crudRuta'), pedido, almacen, + camion, message, language: languageProviderReducer, router: connectRouter(history), |