Added custom date picker BOD-246
This commit is contained in:
@@ -0,0 +1,31 @@
|
|||||||
|
import React, { forwardRef, useEffect } from "react";
|
||||||
|
import { DatePicker } from "antd";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import moment from "moment";
|
||||||
|
//To be used as a form element only.
|
||||||
|
|
||||||
|
const CustomDatePicker = ({ value, onChange, onBlur, ...restProps }, ref) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const handleChange = (newDate) => {
|
||||||
|
if (value !== newDate && onChange) {
|
||||||
|
onChange(newDate);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleKeyDown = (e) => {
|
||||||
|
if (e.key.toLowerCase() === "t") {
|
||||||
|
if (onChange) {
|
||||||
|
onChange(new moment());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div onKeyDown={handleKeyDown}>
|
||||||
|
<DatePicker value={value} onChange={handleChange} {...restProps} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default forwardRef(CustomDatePicker);
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Input, Popover } from "antd";
|
import { Input, Popover } from "antd";
|
||||||
import React, { useEffect, useState, forwardRef } from "react";
|
import React, { useEffect, useState, forwardRef } from "react";
|
||||||
|
|
||||||
const FieldInputNUmberCalculator = (
|
const FormInputNUmberCalculator = (
|
||||||
{ value: formValue, onChange: formOnChange },
|
{ value: formValue, onChange: formOnChange },
|
||||||
ref
|
ref
|
||||||
) => {
|
) => {
|
||||||
@@ -114,4 +114,4 @@ const FieldInputNUmberCalculator = (
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default forwardRef(FieldInputNUmberCalculator);
|
export default forwardRef(FormInputNUmberCalculator);
|
||||||
@@ -3,6 +3,7 @@ import React from "react";
|
|||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
|
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
|
||||||
import FormRow from "../layout-form-row/layout-form-row.component";
|
import FormRow from "../layout-form-row/layout-form-row.component";
|
||||||
|
import FormDatePicker from "../form-date-picker/form-date-picker.component";
|
||||||
|
|
||||||
export default function JobsDetailDatesComponent({ job }) {
|
export default function JobsDetailDatesComponent({ job }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -12,10 +13,11 @@ export default function JobsDetailDatesComponent({ job }) {
|
|||||||
<FormRow header={t("jobs.forms.estdates")}>
|
<FormRow header={t("jobs.forms.estdates")}>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.date_estimated")}
|
label={t("jobs.fields.date_estimated")}
|
||||||
name='date_estimated'>
|
name="date_estimated"
|
||||||
|
>
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.date_open")} name='date_open'>
|
<Form.Item label={t("jobs.fields.date_open")} name="date_open">
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</FormRow>
|
</FormRow>
|
||||||
@@ -23,46 +25,51 @@ export default function JobsDetailDatesComponent({ job }) {
|
|||||||
<FormRow header={t("jobs.forms.scheddates")}>
|
<FormRow header={t("jobs.forms.scheddates")}>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.date_scheduled")}
|
label={t("jobs.fields.date_scheduled")}
|
||||||
name='date_scheduled'>
|
name="date_scheduled"
|
||||||
|
>
|
||||||
|
<FormDatePicker />
|
||||||
|
</Form.Item>
|
||||||
|
<Form.Item label={t("jobs.fields.scheduled_in")} name="scheduled_in">
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.scheduled_in")} name='scheduled_in'>
|
<Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
|
||||||
<DateTimePicker />
|
|
||||||
</Form.Item>
|
|
||||||
<Form.Item label={t("jobs.fields.actual_in")} name='actual_in'>
|
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</FormRow>
|
</FormRow>
|
||||||
<FormRow header={t("jobs.forms.repairdates")}>
|
<FormRow header={t("jobs.forms.repairdates")}>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.scheduled_completion")}
|
label={t("jobs.fields.scheduled_completion")}
|
||||||
name='scheduled_completion'>
|
name="scheduled_completion"
|
||||||
|
>
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.actual_completion")}
|
label={t("jobs.fields.actual_completion")}
|
||||||
name='actual_completion'>
|
name="actual_completion"
|
||||||
|
>
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.scheduled_delivery")}
|
label={t("jobs.fields.scheduled_delivery")}
|
||||||
name='scheduled_delivery'>
|
name="scheduled_delivery"
|
||||||
|
>
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("jobs.fields.actual_delivery")}
|
label={t("jobs.fields.actual_delivery")}
|
||||||
name='actual_delivery'>
|
name="actual_delivery"
|
||||||
|
>
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</FormRow>
|
</FormRow>
|
||||||
<FormRow header={t("jobs.forms.admindates")}>
|
<FormRow header={t("jobs.forms.admindates")}>
|
||||||
<Form.Item label={t("jobs.fields.date_invoiced")} name='date_invoiced'>
|
<Form.Item label={t("jobs.fields.date_invoiced")} name="date_invoiced">
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.date_closed")} name='date_closed'>
|
<Form.Item label={t("jobs.fields.date_closed")} name="date_closed">
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.date_exported")} name='date_exported'>
|
<Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
|
||||||
<DateTimePicker />
|
<DateTimePicker />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</FormRow>
|
</FormRow>
|
||||||
|
|||||||
Reference in New Issue
Block a user