Add Almacenes

- todo de almacenes, redux, pagina
- mejoro form de pedido (etiqueta estado, RUC)

#TODO
- Ver combobox con API

3 files changed, 17 insertions, 6 deletions

diff --git a/front/odiparpack/app/components/Forms/ReduxFormMUI.js b/front/odiparpack/app/components/Forms/ReduxFormMUI.js
index e3f5c33..285543f 100644
--- a/front/odiparpack/app/components/Forms/ReduxFormMUI.js
+++ b/front/odiparpack/app/components/Forms/ReduxFormMUI.js
@@ -6,6 +6,8 @@ import Checkbox from '@material-ui/core/Checkbox';
 import Switch from '@material-ui/core/Switch';
 import { DateTimePicker, MuiPickersUtilsProvider } from '@material-ui/pickers';
 
+import { etiqueta } from '../Odipar/common';
+import { Chip } from '@material-ui/core';
 import MomentUtils from '@date-io/moment';
 import moment from 'moment'
 import 'moment/locale/es'
@@ -88,3 +90,8 @@ export const DatePickerRedux = ({ input, label, readonly}) => (
   />
   </MuiPickersUtilsProvider>
 );
+
+export const EstadoRedux = ({input, label}) => {
+  const value = input.value? input.value : 0
+  return etiqueta("etiq_pedido", value)
+}
diff --git a/front/odiparpack/app/components/Odipar/common.js b/front/odiparpack/app/components/Odipar/common.js
index 39ba76a..b6fb49d 100644
--- a/front/odiparpack/app/components/Odipar/common.js
+++ b/front/odiparpack/app/components/Odipar/common.js
@@ -3,7 +3,7 @@ import { Chip } from "@material-ui/core";
 import { pedido, camion, bloqueo, almacen } from './EtiquetaData'
 import Brightness1Icon from '@material-ui/icons/Brightness1';
 
-const etiquetaStyle = color => ({
+export const etiquetaStyle = color => ({
   fontWeight: 'bold',
   color: '#FFF',
   backgroundColor: color
@@ -27,10 +27,11 @@ export function etiqueta(tipo , estado) { // eslint-disable-line
       color = bloqueo[Object.keys(bloqueo)[estado]].color
       break;
     case 'etiq_alma': 
-      console.log("entre?")
-      text = almacen[Object.keys(almacen)[estado]].text
-      color = almacen[Object.keys(almacen)[estado]].color
-      icon = almacen[Object.keys(almacen)[estado]].icon
+      let {estadoNum} = 2
+      estado === false? estadoNum = 0 : estadoNum = 1
+      text = almacen[Object.keys(almacen)[estadoNum]].text
+      color = almacen[Object.keys(almacen)[estadoNum]].color
+      icon = almacen[Object.keys(almacen)[estadoNum]].icon
       break;
   }
 
diff --git a/front/odiparpack/app/components/Tables/CrudTableForm.js b/front/odiparpack/app/components/Tables/CrudTableForm.js
index 0ba5264..017a3fc 100644
--- a/front/odiparpack/app/components/Tables/CrudTableForm.js
+++ b/front/odiparpack/app/components/Tables/CrudTableForm.js
@@ -5,10 +5,13 @@ 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)
+      //console.log("en el FORM",this.props.dataInit)}
       this.props.fetchData(this.props.dataInit, this.props.branch);
     }
   }