mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-30 08:48:11 +00:00
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
This commit is contained in:
@@ -30,7 +30,6 @@ import {
|
|||||||
TextInput,
|
TextInput,
|
||||||
UnstyledButton,
|
UnstyledButton,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { DateInput } from "@mantine/dates";
|
|
||||||
|
|
||||||
import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
|
import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
|
||||||
import { QUERY_KEYS } from "@/constants/QUERY_KEYS";
|
import { QUERY_KEYS } from "@/constants/QUERY_KEYS";
|
||||||
@@ -331,7 +330,6 @@ const FirstMilePage = () => {
|
|||||||
|
|
||||||
const [distanceOpen, setDistanceOpen] = useState(false);
|
const [distanceOpen, setDistanceOpen] = useState(false);
|
||||||
const [distanceValue, setDistanceValue] = useState("");
|
const [distanceValue, setDistanceValue] = useState("");
|
||||||
const [distanceDate, setDistanceDate] = useState<Date | null>(null);
|
|
||||||
|
|
||||||
const { data: listData, isLoading } = useQuery({
|
const { data: listData, isLoading } = useQuery({
|
||||||
queryKey: QUERY_KEYS.FIRST_MILE.list(),
|
queryKey: QUERY_KEYS.FIRST_MILE.list(),
|
||||||
@@ -478,7 +476,6 @@ const FirstMilePage = () => {
|
|||||||
const openDistance = (id: string) => {
|
const openDistance = (id: string) => {
|
||||||
setActiveId(id);
|
setActiveId(id);
|
||||||
setDistanceValue("");
|
setDistanceValue("");
|
||||||
setDistanceDate(new Date());
|
|
||||||
setDistanceOpen(true);
|
setDistanceOpen(true);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -486,7 +483,6 @@ const FirstMilePage = () => {
|
|||||||
setDistanceOpen(false);
|
setDistanceOpen(false);
|
||||||
setActiveId(null);
|
setActiveId(null);
|
||||||
setDistanceValue("");
|
setDistanceValue("");
|
||||||
setDistanceDate(null);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleSaveDistance = () => {
|
const handleSaveDistance = () => {
|
||||||
@@ -1114,12 +1110,6 @@ const FirstMilePage = () => {
|
|||||||
step={0.1}
|
step={0.1}
|
||||||
decimalScale={2}
|
decimalScale={2}
|
||||||
/>
|
/>
|
||||||
<DateInput
|
|
||||||
label="Date"
|
|
||||||
placeholder="Select date"
|
|
||||||
value={distanceDate}
|
|
||||||
onChange={setDistanceDate}
|
|
||||||
/>
|
|
||||||
<Group justify="flex-end" gap="sm">
|
<Group justify="flex-end" gap="sm">
|
||||||
<Button variant="default" onClick={closeDistance}>Cancel</Button>
|
<Button variant="default" onClick={closeDistance}>Cancel</Button>
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
Reference in New Issue
Block a user