admin/ausgaben-next
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Datenbank aufgefüllt und Einträge angepasst (bei 'Wie')

Browse Source
This commit is contained in:
Reinhard X. Fürst
2026-02-27 15:38:07 +00:00
parent 064036a74e
commit ebd031ee58
9 changed files with 233 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/ausgaben/[id]/route.ts
View File

@@ -10,23 +10,23 @@ export async function PUT(
try {
const { id } = await context.params;
const body = await request.json();
const { Datum, WochTag, Wo, Was, Wieviel, Wie, OK } = body;
const { Datum, Wo, Was, Wieviel, Wie, TYP, OK } = body;
const pool = getDbPool();
const query = `
UPDATE Ausgaben
SET Datum = ?, WochTag = ?, Wo = ?, Was = ?, Wieviel = ?, Wie = ?, OK = ?
SET Datum = ?, Wo = ?, Was = ?, Wieviel = ?, Wie = ?, TYP = ?, OK = ?
WHERE ID = ?
`;
const [result] = await pool.query<ResultSetHeader>(query, [
Datum,
WochTag,
Wo,
Was,
parseFloat(Wieviel),
Wie,
TYP,
OK || 0,
parseInt(id),
]);

35
app/api/ausgaben/route.ts
View File

@@ -10,20 +10,41 @@ export async function GET(request: Request) {
const startDate = searchParams.get('startDate');
const month = searchParams.get('month');
const year = searchParams.get('year');
const typ = searchParams.get('typ');
const pool = getDbPool();
let query = 'SELECT * FROM Ausgaben';
let query = `SELECT *,
CASE DAYOFWEEK(Datum)
WHEN 1 THEN 'Sonntag'
WHEN 2 THEN 'Montag'
WHEN 3 THEN 'Dienstag'
WHEN 4 THEN 'Mittwoch'
WHEN 5 THEN 'Donnerstag'
WHEN 6 THEN 'Freitag'
WHEN 7 THEN 'Samstag'
END as WochTag
FROM Ausgaben`;
const params: any[] = [];
const conditions: string[] = [];
if (typ !== null && typ !== undefined) {
conditions.push('TYP = ?');
params.push(parseInt(typ));
}
if (month && year) {
query += ' WHERE YEAR(Datum) = ? AND MONTH(Datum) = ?';
conditions.push('YEAR(Datum) = ? AND MONTH(Datum) = ?');
params.push(year, month);
} else if (startDate) {
query += ' WHERE Datum >= ?';
conditions.push('Datum >= ?');
params.push(startDate);
}
if (conditions.length > 0) {
query += ' WHERE ' + conditions.join(' AND ');
}
query += ' ORDER BY Datum DESC, ID DESC LIMIT ?';
params.push(parseInt(limit));
@@ -46,9 +67,9 @@ export async function GET(request: Request) {
export async function POST(request: Request) {
try {
const body = await request.json();
const { Datum, WochTag, Wo, Was, Wieviel, Wie, OK } = body;
const { Datum, Wo, Was, Wieviel, Wie, TYP, OK } = body;
if (!Datum || !Wo || !Was || !Wieviel || !Wie) {
if (!Datum || !Wo || !Was || !Wieviel || !Wie || TYP === undefined) {
return NextResponse.json(
{ success: false, error: 'Missing required fields' },
{ status: 400 }
@@ -58,17 +79,17 @@ export async function POST(request: Request) {
const pool = getDbPool();
const query = `
INSERT INTO Ausgaben (Datum, WochTag, Wo, Was, Wieviel, Wie, OK)
INSERT INTO Ausgaben (Datum, Wo, Was, Wieviel, Wie, TYP, OK)
VALUES (?, ?, ?, ?, ?, ?, ?)
`;
const [result] = await pool.query<ResultSetHeader>(query, [
Datum,
WochTag,
Wo,
Was,
parseFloat(Wieviel),
Wie,
TYP,
OK || 0,
]);

78
app/api/ausgaben/stats/route.ts
View File

@@ -8,53 +8,73 @@ export async function GET(request: Request) {
const { searchParams } = new URL(request.url);
const month = searchParams.get('month');
const year = searchParams.get('year');
const typ = searchParams.get('typ');
if (!month || !year) {
if (!month || !year || typ === null) {
return NextResponse.json(
{ success: false, error: 'Month and year are required' },
{ success: false, error: 'Month, year and typ are required' },
{ status: 400 }
);
}
const pool = getDbPool();
// Get total ausgaben and breakdown by payment type
const query = `
SELECT
SUM(CASE WHEN Wie IN ('EC-R', 'EC-B', 'bar-R', 'bar-B', 'Ueber') THEN Wieviel ELSE 0 END) as totalAusgaben,
SUM(CASE WHEN Wie = 'EC-R' THEN Wieviel ELSE 0 END) as ECR,
SUM(CASE WHEN Wie = 'EC-B' THEN Wieviel ELSE 0 END) as ECB,
SUM(CASE WHEN Wie = 'bar-R' THEN Wieviel ELSE 0 END) as barR,
SUM(CASE WHEN Wie = 'bar-B' THEN Wieviel ELSE 0 END) as barB,
SUM(CASE WHEN Wie = 'Einnahme' THEN Wieviel ELSE 0 END) as Einnahmen,
SUM(CASE WHEN Wie = 'Ueber' THEN Wieviel ELSE 0 END) as Ueberweisungen
FROM Ausgaben
WHERE YEAR(Datum) = ? AND MONTH(Datum) = ?
`;
// Get total ausgaben and breakdown by payment type based on TYP
let query: string;
if (parseInt(typ) === 0) {
// Haushalt - unterstützt beide Varianten: mit/ohne Bindestrich und Ein/Einnahme, Uber/Ueber
query = `
SELECT
SUM(CASE WHEN Wie IN ('EC-R', 'ECR', 'EC-B', 'ECB', 'bar-R', 'barR', 'bar-B', 'barB', 'Ueber', 'Uber') THEN Wieviel ELSE 0 END) as totalAusgaben,
SUM(CASE WHEN Wie IN ('EC-R', 'ECR') THEN Wieviel ELSE 0 END) as ECR,
SUM(CASE WHEN Wie IN ('EC-B', 'ECB') THEN Wieviel ELSE 0 END) as ECB,
SUM(CASE WHEN Wie IN ('bar-R', 'barR') THEN Wieviel ELSE 0 END) as barR,
SUM(CASE WHEN Wie IN ('bar-B', 'barB') THEN Wieviel ELSE 0 END) as barB,
SUM(CASE WHEN Wie IN ('Einnahme', 'Ein') THEN Wieviel ELSE 0 END) as Einnahmen,
SUM(CASE WHEN Wie IN ('Ueber', 'Uber') THEN Wieviel ELSE 0 END) as Ueberweisungen
FROM Ausgaben
WHERE YEAR(Datum) = ? AND MONTH(Datum) = ? AND TYP = 0
`;
} else {
// Privat - unterstützt Uber/Ueber für Überweisung
query = `
SELECT
SUM(CASE WHEN Wie IN ('bar', 'EC', 'VISA', 'MASTER', 'Uber', 'Ueber') THEN Wieviel ELSE 0 END) as totalAusgaben,
SUM(CASE WHEN Wie = 'bar' THEN Wieviel ELSE 0 END) as bar,
SUM(CASE WHEN Wie = 'EC' THEN Wieviel ELSE 0 END) as EC,
SUM(CASE WHEN Wie = 'VISA' THEN Wieviel ELSE 0 END) as VISA,
SUM(CASE WHEN Wie = 'MASTER' THEN Wieviel ELSE 0 END) as MASTER,
SUM(CASE WHEN Wie = 'Einnahme' THEN Wieviel ELSE 0 END) as Einnahmen,
SUM(CASE WHEN Wie IN ('Uber', 'Ueber') THEN Wieviel ELSE 0 END) as Ueberweisungen
FROM Ausgaben
WHERE YEAR(Datum) = ? AND MONTH(Datum) = ? AND TYP = 1
`;
}
const [rows] = await pool.query<RowDataPacket[]>(query, [year, month]);
const data = rows[0] || {
totalAusgaben: 0,
ECR: 0,
ECB: 0,
barR: 0,
barB: 0,
Einnahmen: 0,
Ueberweisungen: 0,
};
const data = rows[0] || {};
// Convert string values from MySQL to numbers
const parsedData = {
const parsedData: any = {
totalAusgaben: parseFloat(data.totalAusgaben) || 0,
ECR: parseFloat(data.ECR) || 0,
ECB: parseFloat(data.ECB) || 0,
barR: parseFloat(data.barR) || 0,
barB: parseFloat(data.barB) || 0,
Einnahmen: parseFloat(data.Einnahmen) || 0,
Ueberweisungen: parseFloat(data.Ueberweisungen) || 0,
};
if (parseInt(typ) === 0) {
parsedData.ECR = parseFloat(data.ECR) || 0;
parsedData.ECB = parseFloat(data.ECB) || 0;
parsedData.barR = parseFloat(data.barR) || 0;
parsedData.barB = parseFloat(data.barB) || 0;
} else {
parsedData.bar = parseFloat(data.bar) || 0;
parsedData.EC = parseFloat(data.EC) || 0;
parsedData.VISA = parseFloat(data.VISA) || 0;
parsedData.MASTER = parseFloat(data.MASTER) || 0;
}
return NextResponse.json({
success: true,
data: parsedData,

32
app/page.tsx
View File

@@ -7,6 +7,7 @@ import { AusgabenEntry } from '@/types/ausgaben';
import packageJson from '@/package.json';
export default function Home() {
const [activeTab, setActiveTab] = useState(0); // 0 = Haushalt, 1 = Privat
const [entries, setEntries] = useState<AusgabenEntry[]>([]);
const [isLoading, setIsLoading] = useState(true);
const [selectedEntry, setSelectedEntry] = useState<AusgabenEntry | null>(null);
@@ -15,12 +16,13 @@ export default function Home() {
useEffect(() => {
fetchRecentEntries();
}, []);
setSelectedEntry(null); // Clear selected entry when switching tabs
}, [activeTab]);
const fetchRecentEntries = async () => {
setIsLoading(true);
try {
const response = await fetch('/api/ausgaben?limit=10', {
const response = await fetch(`/api/ausgaben?limit=10&typ=${activeTab}`, {
cache: 'no-store',
headers: {
'Cache-Control': 'no-cache',
@@ -58,9 +60,33 @@ export default function Home() {
<main className="max-w-7xl mx-auto border-2 border-black rounded-lg p-6 bg-[#FFFFDD]">
<h1 className="text-3xl font-bold text-center mb-6">Ausgaben - Log</h1>
{/* Tab Navigation */}
<div className="flex gap-2 mb-6">
<button
onClick={() => setActiveTab(0)}
className={`flex-1 py-3 px-6 rounded-lg font-semibold transition-colors ${
activeTab === 0
? 'bg-[#85B7D7] text-black'
: 'bg-gray-200 text-gray-700 hover:bg-gray-300'
}`}
>
Haushalt
</button>
<button
onClick={() => setActiveTab(1)}
className={`flex-1 py-3 px-6 rounded-lg font-semibold transition-colors ${
activeTab === 1
? 'bg-[#85B7D7] text-black'
: 'bg-gray-200 text-gray-700 hover:bg-gray-300'
}`}
>
Privat
</button>
</div>
<div>
<h2 className="text-xl font-semibold mb-4">Eingabe</h2>
<AusgabenForm onSuccess={handleSuccess} selectedEntry={selectedEntry} />
<AusgabenForm onSuccess={handleSuccess} selectedEntry={selectedEntry} typ={activeTab} />
<div className="mt-6 bg-white border border-black rounded-lg shadow-md p-6">
<h3 className="text-xl font-semibold mb-4">Letzte 10 Einträge</h3>