#76-Hinzufügen-einer-Seitenanzahl-bei-neuen-Kennzahlen #78
|
|
@ -46,21 +46,39 @@ export default function KennzahlenTable({
|
||||||
}: KennzahlenTableProps) {
|
}: KennzahlenTableProps) {
|
||||||
const [editingIndex, setEditingIndex] = useState<string>("");
|
const [editingIndex, setEditingIndex] = useState<string>("");
|
||||||
const [editValue, setEditValue] = useState("");
|
const [editValue, setEditValue] = useState("");
|
||||||
|
const [editingPageIndex, setEditingPageIndex] = useState<string>("");
|
||||||
|
const [editPageValue, setEditPageValue] = useState("");
|
||||||
|
const [hoveredPageIndex, setHoveredPageIndex] = useState<string>("");
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
const { mutate } = useMutation({
|
const { mutate } = useMutation({
|
||||||
mutationFn: (id: string) => {
|
mutationFn: (params: { id: string; newValue?: string; newPage?: number }) => {
|
||||||
|
const { id, newValue, newPage } = params;
|
||||||
const key = id.toUpperCase();
|
const key = id.toUpperCase();
|
||||||
const updatedData = { ...data };
|
const updatedData = { ...data };
|
||||||
updatedData[key] = data[key]?.map((item) => ({
|
|
||||||
...item,
|
if (data[key] && data[key].length > 0) {
|
||||||
entity: editValue,
|
updatedData[key] = data[key].map((item) => ({
|
||||||
})) || [{ label: key, entity: editValue }];
|
...item,
|
||||||
|
...(newValue !== undefined && { entity: newValue }),
|
||||||
|
...(newPage !== undefined && { page: newPage }),
|
||||||
|
}));
|
||||||
|
} else {
|
||||||
|
updatedData[key] = [{
|
||||||
|
label: key,
|
||||||
|
entity: newValue || "",
|
||||||
|
page: newPage || 0,
|
||||||
|
status: "single-source",
|
||||||
|
source: "manual"
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
return fetchPutKPI(Number(pdfId), updatedData);
|
return fetchPutKPI(Number(pdfId), updatedData);
|
||||||
},
|
},
|
||||||
onMutate: async (id: string) => {
|
onMutate: async (params: { id: string; newValue?: string; newPage?: number }) => {
|
||||||
|
const { id, newValue, newPage } = params;
|
||||||
await queryClient.cancelQueries({
|
await queryClient.cancelQueries({
|
||||||
queryKey: ["pitchBookKPI", pdfId],
|
queryKey: ["pitchBookKPI", pdfId],
|
||||||
});
|
});
|
||||||
|
|
@ -71,10 +89,23 @@ export default function KennzahlenTable({
|
||||||
|
|
||||||
queryClient.setQueryData(["pitchBookKPI", pdfId], () => {
|
queryClient.setQueryData(["pitchBookKPI", pdfId], () => {
|
||||||
const updatedData = { ...data };
|
const updatedData = { ...data };
|
||||||
updatedData[key] = data[key]?.map((item) => ({
|
|
||||||
...item,
|
if (data[key] && data[key].length > 0) {
|
||||||
entity: editValue,
|
updatedData[key] = data[key].map((item) => ({
|
||||||
})) || [{ label: key, entity: editValue }];
|
...item,
|
||||||
|
...(newValue !== undefined && { entity: newValue }),
|
||||||
|
...(newPage !== undefined && { page: newPage }),
|
||||||
|
}));
|
||||||
|
} else {
|
||||||
|
updatedData[key] = [{
|
||||||
|
label: key,
|
||||||
|
entity: newValue || "",
|
||||||
|
page: newPage || 0,
|
||||||
|
status: "single-source",
|
||||||
|
source: "manual"
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
return updatedData;
|
return updatedData;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -99,19 +130,39 @@ export default function KennzahlenTable({
|
||||||
setEditValue(value);
|
setEditValue(value);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const startPageEditing = (value: number, index: string) => {
|
||||||
|
setEditingPageIndex(index);
|
||||||
|
setEditPageValue(value.toString());
|
||||||
|
};
|
||||||
|
|
||||||
// Bearbeitung beenden und Wert speichern
|
// Bearbeitung beenden und Wert speichern
|
||||||
const handleSave = async (index: string) => {
|
const handleSave = async (index: string) => {
|
||||||
// await updateKennzahl(rows[index].label, editValue);
|
mutate({ id: index, newValue: editValue });
|
||||||
mutate(index);
|
|
||||||
setEditingIndex("");
|
setEditingIndex("");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handlePageSave = async (index: string) => {
|
||||||
|
const pageNumber = parseInt(editPageValue);
|
||||||
|
if (!isNaN(pageNumber) && pageNumber > 0) {
|
||||||
|
mutate({ id: index, newPage: pageNumber });
|
||||||
|
}
|
||||||
|
setEditingPageIndex("");
|
||||||
|
};
|
||||||
|
|
||||||
// Tastatureingaben verarbeiten
|
// Tastatureingaben verarbeiten
|
||||||
const handleKeyPress = (e: KeyboardEvent<HTMLDivElement>, index: string) => {
|
const handleKeyPress = (e: KeyboardEvent<HTMLDivElement>, index: string) => {
|
||||||
if (e.key === "Enter") {
|
if (e.key === "Enter") {
|
||||||
handleSave(index);
|
handleSave(index);
|
||||||
} else if (e.key === "Escape") {
|
} else if (e.key === "Escape") {
|
||||||
setEditingIndex("null");
|
setEditingIndex("");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handlePageKeyPress = (e: KeyboardEvent<HTMLDivElement>, index: string) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
handlePageSave(index);
|
||||||
|
} else if (e.key === "Escape") {
|
||||||
|
setEditingPageIndex("");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -131,14 +182,16 @@ export default function KennzahlenTable({
|
||||||
<Table>
|
<Table>
|
||||||
<TableHead>
|
<TableHead>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TableCell>
|
<TableCell width="25%">
|
||||||
<strong>Kennzahl</strong>
|
<strong>Kennzahl</strong>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell width="60%">
|
||||||
<strong>Wert</strong>
|
<strong>Wert</strong>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell align="center">
|
<TableCell align="center" width="15%">
|
||||||
<strong>Seite</strong>
|
<Box sx={{ display: "flex", alignItems: "center", justifyContent: "center", gap: 1 }}>
|
||||||
|
<strong>Seite</strong>
|
||||||
|
</Box>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHead>
|
</TableHead>
|
||||||
|
|
@ -165,6 +218,10 @@ export default function KennzahlenTable({
|
||||||
borderColor = "#f6ed48";
|
borderColor = "#f6ed48";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const currentPage = row.extractedValues.at(0)?.page ?? 0;
|
||||||
|
const isPageHovered = hoveredPageIndex === row.setting.name;
|
||||||
|
const canEditPage = !hasMultipleValues;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TableRow key={row.setting.name}>
|
<TableRow key={row.setting.name}>
|
||||||
<TableCell>{row.setting.name}</TableCell>
|
<TableCell>{row.setting.name}</TableCell>
|
||||||
|
|
@ -308,24 +365,115 @@ export default function KennzahlenTable({
|
||||||
)}
|
)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell align="center">
|
<TableCell align="center">
|
||||||
{(row.extractedValues.at(0)?.page ?? 0) > 0 ? (
|
{editingPageIndex === row.setting.name ? (
|
||||||
<Link
|
<TextField
|
||||||
component="button"
|
value={editPageValue}
|
||||||
onClick={() => {
|
onChange={(e) => {
|
||||||
const extractedValue = row.extractedValues.at(0);
|
const value = e.target.value;
|
||||||
if (extractedValue?.page && extractedValue.page > 0) {
|
if (value === '' || /^\d+$/.test(value) && parseInt(value) > 0) {
|
||||||
onPageClick?.(
|
setEditPageValue(value);
|
||||||
Number(extractedValue.page),
|
|
||||||
extractedValue.entity || "",
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
sx={{ cursor: "pointer" }}
|
onKeyDown={(e) => handlePageKeyPress(e, row.setting.name)}
|
||||||
>
|
onBlur={() => handlePageSave(row.setting.name)}
|
||||||
{row.extractedValues.at(0)?.page}
|
autoFocus
|
||||||
</Link>
|
size="small"
|
||||||
|
variant="standard"
|
||||||
|
sx={{
|
||||||
|
width: "60px",
|
||||||
|
"& .MuiInput-input": {
|
||||||
|
textAlign: "center"
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
inputProps={{
|
||||||
|
min: 0,
|
||||||
|
style: { textAlign: 'center' }
|
||||||
|
}}
|
||||||
|
/>
|
||||||
) : (
|
) : (
|
||||||
""
|
<>
|
||||||
|
{currentPage > 0 ? (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
position: "relative",
|
||||||
|
cursor: canEditPage ? "pointer" : "default",
|
||||||
|
borderRadius: "4px",
|
||||||
|
minHeight: "32px",
|
||||||
|
minWidth: "100px",
|
||||||
|
transition: "all 0.2s ease",
|
||||||
|
}}
|
||||||
|
onMouseEnter={() => canEditPage && setHoveredPageIndex(row.setting.name)}
|
||||||
|
onMouseLeave={() => setHoveredPageIndex("")}
|
||||||
|
onClick={() => {
|
||||||
|
if (canEditPage) {
|
||||||
|
startPageEditing(currentPage, row.setting.name);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Link
|
||||||
|
component="button"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
const extractedValue = row.extractedValues.at(0);
|
||||||
|
if (extractedValue?.page && extractedValue.page > 0) {
|
||||||
|
onPageClick?.(Number(extractedValue.page), extractedValue.entity || "");
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
sx={{ cursor: "pointer" }}
|
||||||
|
>
|
||||||
|
{currentPage}
|
||||||
|
</Link>
|
||||||
|
|
||||||
|
{isPageHovered && canEditPage && (
|
||||||
|
<EditIcon
|
||||||
|
fontSize="small"
|
||||||
|
sx={{
|
||||||
|
position: "absolute",
|
||||||
|
left: "70px",
|
||||||
|
color: "#666",
|
||||||
|
opacity: 0.7,
|
||||||
|
transition: "opacity 0.2s ease",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
) : canEditPage ? (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
position: "relative",
|
||||||
|
cursor: "pointer",
|
||||||
|
minHeight: "32px",
|
||||||
|
minWidth: "100px",
|
||||||
|
borderRadius: "4px",
|
||||||
|
backgroundColor: isPageHovered ? "#f8f9fa" : "transparent",
|
||||||
|
}}
|
||||||
|
onMouseEnter={() => setHoveredPageIndex(row.setting.name)}
|
||||||
|
onMouseLeave={() => setHoveredPageIndex("")}
|
||||||
|
onClick={() => startPageEditing(0, row.setting.name)}
|
||||||
|
>
|
||||||
|
<span style={{ color: "#999" }}>...</span>
|
||||||
|
<EditIcon
|
||||||
|
fontSize="small"
|
||||||
|
sx={{
|
||||||
|
position: "absolute",
|
||||||
|
left: "70px",
|
||||||
|
color: "#555",
|
||||||
|
cursor: "pointer",
|
||||||
|
opacity: 0.7,
|
||||||
|
transition: "opacity 0.2s ease",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
) : (
|
||||||
|
""
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
@ -335,4 +483,4 @@ export default function KennzahlenTable({
|
||||||
</Table>
|
</Table>
|
||||||
</TableContainer>
|
</TableContainer>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
|
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
|
||||||
|
import EditIcon from "@mui/icons-material/Edit";
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
Button,
|
Button,
|
||||||
|
|
@ -27,6 +28,7 @@ import {
|
||||||
} from "@tanstack/react-query";
|
} from "@tanstack/react-query";
|
||||||
import { createFileRoute, useNavigate } from "@tanstack/react-router";
|
import { createFileRoute, useNavigate } from "@tanstack/react-router";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
import type { KeyboardEvent } from "react";
|
||||||
import PDFViewer from "../components/pdfViewer";
|
import PDFViewer from "../components/pdfViewer";
|
||||||
import { fetchPutKPI } from "../util/api";
|
import { fetchPutKPI } from "../util/api";
|
||||||
import { kpiQueryOptions } from "../util/query";
|
import { kpiQueryOptions } from "../util/query";
|
||||||
|
|
@ -65,13 +67,23 @@ function ExtractedResultsPage() {
|
||||||
const [showConfirmDialog, setShowConfirmDialog] = useState(false);
|
const [showConfirmDialog, setShowConfirmDialog] = useState(false);
|
||||||
const [hasChanges, setHasChanges] = useState(false);
|
const [hasChanges, setHasChanges] = useState(false);
|
||||||
const [customValue, setCustomValue] = useState("");
|
const [customValue, setCustomValue] = useState("");
|
||||||
|
const [customPage, setCustomPage] = useState("");
|
||||||
|
const [editingCustomPage, setEditingCustomPage] = useState(false);
|
||||||
|
|
||||||
const originalValue = kpiValues[0]?.entity || "";
|
const originalValue = kpiValues[0]?.entity || "";
|
||||||
|
const originalPage = kpiValues[0]?.page || 0;
|
||||||
const selectedValue =
|
const selectedValue =
|
||||||
selectedIndex === -1 ? customValue : kpiValues[selectedIndex]?.entity || "";
|
selectedIndex === -1 ? customValue : kpiValues[selectedIndex]?.entity || "";
|
||||||
|
const selectedPage =
|
||||||
|
selectedIndex === -1
|
||||||
|
? (parseInt(customPage) > 0 ? parseInt(customPage) : 1)
|
||||||
|
: kpiValues[selectedIndex]?.page || 1;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setHasChanges(selectedValue !== originalValue);
|
const valueChanged = selectedValue !== originalValue;
|
||||||
}, [selectedValue, originalValue]);
|
const pageChanged = selectedPage !== originalPage;
|
||||||
|
setHasChanges(valueChanged || pageChanged);
|
||||||
|
}, [selectedValue, selectedPage, originalValue, originalPage]);
|
||||||
|
|
||||||
const { mutate: updateKPI } = useMutation({
|
const { mutate: updateKPI } = useMutation({
|
||||||
mutationFn: () => {
|
mutationFn: () => {
|
||||||
|
|
@ -83,7 +95,7 @@ function ExtractedResultsPage() {
|
||||||
baseObject = {
|
baseObject = {
|
||||||
label: kpi.toUpperCase(),
|
label: kpi.toUpperCase(),
|
||||||
entity: selectedValue,
|
entity: selectedValue,
|
||||||
page: 0,
|
page: selectedPage,
|
||||||
status: "single-source",
|
status: "single-source",
|
||||||
source: "manual",
|
source: "manual",
|
||||||
};
|
};
|
||||||
|
|
@ -92,6 +104,7 @@ function ExtractedResultsPage() {
|
||||||
{
|
{
|
||||||
...baseObject,
|
...baseObject,
|
||||||
entity: selectedValue,
|
entity: selectedValue,
|
||||||
|
page: selectedPage,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
return fetchPutKPI(Number(pitchBook), updatedData);
|
return fetchPutKPI(Number(pitchBook), updatedData);
|
||||||
|
|
@ -120,6 +133,7 @@ function ExtractedResultsPage() {
|
||||||
setSelectedIndex(index);
|
setSelectedIndex(index);
|
||||||
setCurrentPage(kpiValues[index].page);
|
setCurrentPage(kpiValues[index].page);
|
||||||
setCustomValue("");
|
setCustomValue("");
|
||||||
|
setCustomPage("");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -131,10 +145,21 @@ function ExtractedResultsPage() {
|
||||||
setSelectedIndex(-1);
|
setSelectedIndex(-1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleCustomPageChange = (
|
||||||
|
event: React.ChangeEvent<HTMLInputElement>,
|
||||||
|
) => {
|
||||||
|
const value = event.target.value;
|
||||||
|
// Allow empty string or positive numbers only (no 0)
|
||||||
|
if (value === '' || (/^\d+$/.test(value) && parseInt(value) > 0)) {
|
||||||
|
setCustomPage(value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleRowClick = (index: number) => {
|
const handleRowClick = (index: number) => {
|
||||||
setCurrentPage(kpiValues[index].page);
|
setCurrentPage(kpiValues[index].page);
|
||||||
setSelectedIndex(index);
|
setSelectedIndex(index);
|
||||||
setCustomValue("");
|
setCustomValue("");
|
||||||
|
setCustomPage("");
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleBackClick = () => {
|
const handleBackClick = () => {
|
||||||
|
|
@ -166,6 +191,18 @@ function ExtractedResultsPage() {
|
||||||
updateKPI();
|
updateKPI();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const startCustomPageEditing = () => {
|
||||||
|
setEditingCustomPage(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCustomPageKeyPress = (e: KeyboardEvent<HTMLDivElement>) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
setEditingCustomPage(false);
|
||||||
|
} else if (e.key === "Escape") {
|
||||||
|
setEditingCustomPage(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box p={4}>
|
<Box p={4}>
|
||||||
<Box sx={{ display: "flex", alignItems: "center", mb: 3 }}>
|
<Box sx={{ display: "flex", alignItems: "center", mb: 3 }}>
|
||||||
|
|
@ -203,10 +240,10 @@ function ExtractedResultsPage() {
|
||||||
<Table>
|
<Table>
|
||||||
<TableHead>
|
<TableHead>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TableCell>
|
<TableCell width="85%">
|
||||||
<strong>Gefundene Werte</strong>
|
<strong>Gefundene Werte</strong>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell align="center">
|
<TableCell align="center" width="15%">
|
||||||
<strong>Seite</strong>
|
<strong>Seite</strong>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
@ -318,6 +355,61 @@ function ExtractedResultsPage() {
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
<TableCell align="center">
|
||||||
|
{editingCustomPage ? (
|
||||||
|
<TextField
|
||||||
|
value={customPage}
|
||||||
|
onChange={handleCustomPageChange}
|
||||||
|
onKeyDown={handleCustomPageKeyPress}
|
||||||
|
onBlur={() => setEditingCustomPage(false)}
|
||||||
|
autoFocus
|
||||||
|
size="small"
|
||||||
|
variant="standard"
|
||||||
|
sx={{
|
||||||
|
width: "60px",
|
||||||
|
"& .MuiInput-input": {
|
||||||
|
textAlign: "center"
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
inputProps={{
|
||||||
|
min: 0,
|
||||||
|
style: { textAlign: 'center' }
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
gap: 1,
|
||||||
|
cursor: "pointer",
|
||||||
|
minHeight: "24px",
|
||||||
|
minWidth: "100px",
|
||||||
|
margin: "0 auto",
|
||||||
|
}}
|
||||||
|
onClick={(e: React.MouseEvent) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
startCustomPageEditing();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span>{customPage || "..."}</span>
|
||||||
|
<EditIcon
|
||||||
|
fontSize="small"
|
||||||
|
sx={{
|
||||||
|
color: "#666",
|
||||||
|
opacity: 0.7,
|
||||||
|
transition: "opacity 0.2s ease",
|
||||||
|
ml: 1
|
||||||
|
}}
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
startCustomPageEditing();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue