From 55c0f57d42d82f1f1f5809e9c7d6845b6e0b68af Mon Sep 17 00:00:00 2001 From: gabrhr <73925454+gabrhr@users.noreply.github.com> Date: Wed, 25 May 2022 15:36:35 -0500 Subject: Add PedidoPage - cambio de esqueleto segun figma - componente de etiquetas - tabla y form de Pedido #TODO - estetica de etiquetas - redux y crear end points --- front/odiparpack/app/components/Odipar/common.js | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 front/odiparpack/app/components/Odipar/common.js (limited to 'front/odiparpack/app/components/Odipar/common.js') diff --git a/front/odiparpack/app/components/Odipar/common.js b/front/odiparpack/app/components/Odipar/common.js new file mode 100644 index 0000000..c66b792 --- /dev/null +++ b/front/odiparpack/app/components/Odipar/common.js @@ -0,0 +1,38 @@ +import React from "react" +import { Chip } from "@material-ui/core"; +import {pedido, camion, bloqueo, almacen} from './EtiquetaData' + +const etiquetaStyle = color => ({ + fontWeight: 'bold', + color: '#FFF', + backgroundColor: color +}); + + +//Etiquetas +export function etiqueta(tipo , estado) { // eslint-disable-line + let {color, text} = "" + switch(tipo){ + case 'etiq_pedido': + text = pedido[Object.keys(pedido)[estado]].text + color = pedido[Object.keys(pedido)[estado]].color + break; + case 'etiq_camion': + text = camion[Object.keys(camion)[estado]].text + color = camion[Object.keys(camion)[estado]].color + break; + case 'etiq_bloqueo': + text = bloqueo[Object.keys(bloqueo)[estado]].text + 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 + break; + } + + return ( + + ) +} \ No newline at end of file -- cgit v1.2.3 From 9c396976bb42a9d41407358ce1a1d37242230f21 Mon Sep 17 00:00:00 2001 From: gabrhr <73925454+gabrhr@users.noreply.github.com> Date: Fri, 27 May 2022 12:50:13 -0500 Subject: Add redux, dispatch and etiquetas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- front/odiparpack/app/components/Odipar/common.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'front/odiparpack/app/components/Odipar/common.js') 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 ( - + tipo == "etiq_alma" ? + } style={{fontWeight: 'bold', backgroundColor: color}}/> : + ) } \ No newline at end of file -- cgit v1.2.3 From cbc7d7f7494508fda69e88c76702a878bebca0e2 Mon Sep 17 00:00:00 2001 From: gabrhr <73925454+gabrhr@users.noreply.github.com> Date: Tue, 31 May 2022 03:58:23 -0500 Subject: Add Almacenes - todo de almacenes, redux, pagina - mejoro form de pedido (etiqueta estado, RUC) #TODO - Ver combobox con API --- front/odiparpack/app/components/Odipar/common.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'front/odiparpack/app/components/Odipar/common.js') 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; } -- cgit v1.2.3