Add redux, dispatch and etiquetas

- estetica de etiquetas (ok)
- add message, pedido Reducer
- add dispatch en Componentes con connect
- add api reducer que obtienen el JSON todo ok

#TODO
- FIX logica de añadiir
- FIX axios y dispatch fuera de un componente

4 files changed, 40 insertions, 29 deletions

diff --git a/front/odiparpack/app/components/Odipar/EtiquetaData.js b/front/odiparpack/app/components/Odipar/EtiquetaData.js
index 4a2a37c..a2f262d 100644
--- a/front/odiparpack/app/components/Odipar/EtiquetaData.js
+++ b/front/odiparpack/app/components/Odipar/EtiquetaData.js
@@ -1,10 +1,5 @@
 //Pedido
 export const pedido = {
-    entregado: {
-      text: "Entregado",
-      color: "#81C784",
-      icon: false
-    },
     pendiente:{
       text: "Pendiente",
       color: "#FFB74D",
@@ -15,59 +10,71 @@ export const pedido = {
       color: "#64B5F6",
       icon: false
     },
+    entregado: {
+      text: "Entregado",
+      color: "#81C784",
+      icon: false
+    },
     cancelado: {
       text: "Cancelado",
       color: "#E57373",
       icon: false
-    } 
+    },
+    pendienteAveria:{
+      text: "Pendiente por Averia",
+      color: "#FFB74D",
+      icon: false
+    }
   }
   
   //Camion
   export const camion = {
-    entregado: {
-      text: "Entregado",
+    disponible : {
+      text: "Disponible",
       color: "#81C784",
       icon: false
     },
-    pendiente:{
-      text: "Pendiente",
-      color: "#FFB74D",
+    enReparto: {
+      text: "En Reparto",
+      color: "#64B5F6",
       icon: false
     },
-    enCamino: {
-      text: "En Camino",
-      color: "#64B5F6",
+    mantenimiento:{
+      text: "Mantenimiento",
+      color: "#FFB74D",
       icon: false
     },
     cancelado: {
-      text: "Cancelado",
+      text: "Inhabilitado",
       color: "#E57373",
       icon: false
     } 
   }
   
+  //Bloqueos
   export const bloqueo = {
     desbloqueado: {
-      text: "Entregado",
+      text: "Disponible",
       color: "#81C784",
       icon: false
     },
     bloqueado:{
-      text: "Pendiente",
-      color: "#FFB74D",
+      text: "Bloqueado",
+      color: "#E57373",
       icon: false
     } 
   }
-  
+
+  //Almacen
   export const almacen = {
     noPrincipal: {
       text: "Pequeño",
-      color: "#81C784",
-      icon: false
+      color: "#DED8D8",
+      icon: 10
     },
     principal:{
       text: "Principal",
-      color: "#FFB74D",
-      icon: false
+      color: "#DED8D8",
+      icon: 16
     } 
   }
\ No newline at end of file
diff --git a/front/odiparpack/app/components/Odipar/common.js b/front/odiparpack/app/components/Odipar/common.js
index c66b792..39ba76a 100644
--- a/front/odiparpack/app/components/Odipar/common.js
+++ b/front/odiparpack/app/components/Odipar/common.js
@@ -1,6 +1,7 @@
 import React from "react"
 import { Chip } from "@material-ui/core";
-import {pedido, camion, bloqueo, almacen} from './EtiquetaData'
+import { pedido, camion, bloqueo, almacen } from './EtiquetaData'
+import Brightness1Icon from '@material-ui/icons/Brightness1';
 
 const etiquetaStyle = color => ({
   fontWeight: 'bold',
@@ -11,7 +12,7 @@ const etiquetaStyle = color => ({
 
 //Etiquetas
 export function etiqueta(tipo , estado) { // eslint-disable-line
-  let {color, text} = ""
+  let {color, text, icon} = ""
   switch(tipo){
     case 'etiq_pedido': 
       text = pedido[Object.keys(pedido)[estado]].text
@@ -29,10 +30,13 @@ export function etiqueta(tipo , estado) { // eslint-disable-line
       console.log("entre?")
       text = almacen[Object.keys(almacen)[estado]].text
       color = almacen[Object.keys(almacen)[estado]].color
+      icon = almacen[Object.keys(almacen)[estado]].icon
       break;
   }
 
   return (
-    <Chip label={text} style={etiquetaStyle(color)}/>
+    tipo == "etiq_alma" ?
+      <Chip label={text} icon = {<Brightness1Icon style={{ fontSize: icon, color: "#B1ABAB" }}/>} style={{fontWeight: 'bold', backgroundColor: color}}/> :
+      <Chip label={text} style={etiquetaStyle(color)}/>
   )
 }
\ No newline at end of file
diff --git a/front/odiparpack/app/components/Sidebar/MainMenuSimple.js b/front/odiparpack/app/components/Sidebar/MainMenuSimple.js
index f7634ca..18ac8fd 100644
--- a/front/odiparpack/app/components/Sidebar/MainMenuSimple.js
+++ b/front/odiparpack/app/components/Sidebar/MainMenuSimple.js
@@ -5,10 +5,8 @@ import classNames from 'classnames';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom';
-import ExpandLess from '@material-ui/icons/ExpandLess';
-import ExpandMore from '@material-ui/icons/ExpandMore';
 // Menu Object
-import MenuContent from 'ba-api/menu';
+import MenuContent from 'odi-utils/menu';
 import { List, ListItem, ListItemIcon, ListItemText, Collapse, Icon } from '@material-ui/core';
 import styles from './sidebar-jss';
 
diff --git a/front/odiparpack/app/components/Tables/CrudTableForm.js b/front/odiparpack/app/components/Tables/CrudTableForm.js
index d2d2ea8..219fcd2 100644
--- a/front/odiparpack/app/components/Tables/CrudTableForm.js
+++ b/front/odiparpack/app/components/Tables/CrudTableForm.js
@@ -6,6 +6,7 @@ import FloatingPanel from './../Panel/FloatingPanel';
 
 class CrudTableForm extends React.Component {
   componentDidMount() {
+    console.log("en el FORM",this.props.dataInit)
     this.props.fetchData(this.props.dataInit, this.props.branch);
   }
 
@@ -31,6 +32,7 @@ class CrudTableForm extends React.Component {
     } = this.props;
     return (
       <div>
+        
         <FloatingPanel openForm={openForm} branch={branch} closeForm={closeForm}>
           <Form onSubmit={this.sendValues} initValues={initValues} branch={branch}>
             {children}