minor fixes

This commit is contained in:
Carl-Gerhard Lindesvärd
2023-10-28 21:57:43 +02:00
parent aa2939f302
commit c8c86d8c23
9 changed files with 78 additions and 76 deletions

View File

@@ -3,6 +3,8 @@ import { RadioGroup, RadioGroupItem } from "../ui/radio-group";
import { changeDateRanges, changeInterval } from "./reportSlice";
import { Combobox } from "../ui/combobox";
import { type IInterval } from "@/types";
import { timeRanges } from "@/utils/constants";
import { entries } from "@/utils/object";
export function ReportDateRange() {
const dispatch = useDispatch();
@@ -12,62 +14,17 @@ export function ReportDateRange() {
return (
<>
<RadioGroup>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges("today"));
}}
>
Today
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(1));
}}
>
24 hours
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(7));
}}
>
7 days
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(14));
}}
>
14 days
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(30));
}}
>
1 month
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(90));
}}
>
3 month
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(180));
}}
>
6 month
</RadioGroupItem>
<RadioGroupItem
onClick={() => {
dispatch(changeDateRanges(356));
}}
>
1 year
</RadioGroupItem>
{entries(timeRanges).map(([range, title]) => (
<RadioGroupItem
key={range}
// active={range === interval}
onClick={() => {
dispatch(changeDateRanges(range));
}}
>
{title}
</RadioGroupItem>
))}
</RadioGroup>
{chartType === "linear" && (
<div className="w-full max-w-[200px]">

View File

@@ -1,16 +1,25 @@
import { Button } from "@/components/ui/button";
import { useReportId } from "../hooks/useReportId";
import { api } from "@/utils/api";
import { api, handleError } from "@/utils/api";
import { useSelector } from "@/redux";
import { pushModal } from "@/modals";
import { toast } from "@/components/ui/use-toast";
export function ReportSaveButton() {
const { reportId } = useReportId();
const update = api.report.update.useMutation();
const update = api.report.update.useMutation({
onSuccess() {
toast({
title: "Success",
description: "Report updated.",
});
},
onError: handleError
});
const report = useSelector((state) => state.report);
if (reportId) {
return <Button onClick={() => {
return <Button loading={update.isLoading} onClick={() => {
update.mutate({
reportId,
report,