Merge branch 'develop' into dayana

1 files changed, 28 insertions, 0 deletions

diff --git a/front/odiparpack/app/components/Forms/ReduxFormMUI.js b/front/odiparpack/app/components/Forms/ReduxFormMUI.js
index 383a717..285543f 100644
--- a/front/odiparpack/app/components/Forms/ReduxFormMUI.js
+++ b/front/odiparpack/app/components/Forms/ReduxFormMUI.js
@@ -4,6 +4,14 @@ import TextField from '@material-ui/core/TextField';
 import Select from '@material-ui/core/Select';
 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'
+moment.locale('es');
 
 /* Textfield */
 export const TextFieldRedux = ({ meta: { touched, error }, input, ...rest }) => (
@@ -67,3 +75,23 @@ SwitchRedux.propTypes = {
   input: PropTypes.object.isRequired,
 };
 /* End */
+
+export const DatePickerRedux = ({ input, label, readonly}) => (
+  
+  <MuiPickersUtilsProvider locale={'es'} utils={MomentUtils}>
+  <DateTimePicker
+      format="DD/MM/YYYY hh:mm A"
+      autoOk
+      onChange={date => input.onChange(moment(date).format("DD/MM/YYYY hh:mm A"))}
+      value={input.value ? moment(input.value,"DD/MM/YYYY hh:mm A"): null}
+      label={label}
+      readOnly = {readonly}
+      disabled = {readonly}
+  />
+  </MuiPickersUtilsProvider>
+);
+
+export const EstadoRedux = ({input, label}) => {
+  const value = input.value? input.value : 0
+  return etiqueta("etiq_pedido", value)
+}