v0.4.5 — Alle Buttons und Funktionen verdrahtet
Fixes: - UpdatePlanEntry Stub/Hook: 7 Parameter → 4 (passend zu Go-Signatur) - AddPlanEntry: undefined → null für Go-Pointer-Parameter - Wails-Stubs (App.js/App.d.ts): Alle Signaturen an Go-Backend angepasst - ExportPDF: Go-Backend-Funktion hinzugefügt (Platzhalter mit Druckvorschau-Hinweis) - Version: 0.4.3 → 0.4.5 in Go-Konstante und InfoPage - Null-Safety: entries/special_days/products Arrays gegen null abgesichert - Allergen/Additive-Listen gegen null von Go abgesichert
This commit is contained in:
25
app.go
25
app.go
@@ -373,6 +373,31 @@ func (a *App) DownloadUpdate() (string, error) {
|
|||||||
return a.updater.DownloadUpdate(*info)
|
return a.updater.DownloadUpdate(*info)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PDF EXPORT
|
||||||
|
|
||||||
|
// ExportPDF erstellt eine PDF-Datei des Wochenplans
|
||||||
|
func (a *App) ExportPDF(weekPlanID int, outputPath string) (string, error) {
|
||||||
|
// PDF-Export ist ein Platzhalter — in einer späteren Version wird hier
|
||||||
|
// eine richtige PDF-Bibliothek (z.B. gofpdf) verwendet.
|
||||||
|
// Vorerst geben wir eine Nachricht zurück.
|
||||||
|
plan, err := a.getWeekPlanByID(weekPlanID)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("Wochenplan nicht gefunden: %w", err)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("PDF-Export für KW %d/%d wird in einer zukünftigen Version unterstützt. Bitte nutzen Sie die Druckvorschau.", plan.Week, plan.Year), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getWeekPlanByID lädt einen Wochenplan anhand seiner ID
|
||||||
|
func (a *App) getWeekPlanByID(id int) (*WeekPlan, error) {
|
||||||
|
var plan WeekPlan
|
||||||
|
query := "SELECT id, year, week, created_at FROM week_plans WHERE id = ?"
|
||||||
|
err := db.Get(&plan, query, id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to get week plan by ID: %w", err)
|
||||||
|
}
|
||||||
|
return &plan, nil
|
||||||
|
}
|
||||||
|
|
||||||
// HILFSFUNKTIONEN
|
// HILFSFUNKTIONEN
|
||||||
|
|
||||||
// loadProductRelations lädt Allergene und Zusatzstoffe für ein Produkt
|
// loadProductRelations lädt Allergene und Zusatzstoffe für ein Produkt
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export function InfoPage() {
|
|||||||
<div>
|
<div>
|
||||||
<dt className="text-sm font-medium text-gray-500">Version</dt>
|
<dt className="text-sm font-medium text-gray-500">Version</dt>
|
||||||
<dd className="mt-1 text-sm text-gray-900 font-mono">
|
<dd className="mt-1 text-sm text-gray-900 font-mono">
|
||||||
{updateInfo?.current_version || '1.0.0'}
|
{updateInfo?.current_version || '0.4.5'}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -345,7 +345,7 @@ export function InfoPage() {
|
|||||||
|
|
||||||
<div className="text-sm text-gray-600 space-y-2">
|
<div className="text-sm text-gray-600 space-y-2">
|
||||||
<p>
|
<p>
|
||||||
<strong>Version:</strong> 1.0.0 (Build 2026.02.20)
|
<strong>Version:</strong> 0.4.5 (Build 2026.02.20)
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<strong>Support:</strong> Wenden Sie sich bei Fragen oder Problemen an Ihre IT-Abteilung
|
<strong>Support:</strong> Wenden Sie sich bei Fragen oder Problemen an Ihre IT-Abteilung
|
||||||
|
|||||||
@@ -85,9 +85,8 @@ export function WeekPlanner({ year, week, className = '' }: WeekPlannerProps) {
|
|||||||
setPdfSuccess(null);
|
setPdfSuccess(null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// ExportPDF nimmt weekPlanID und outputPath - Go-Seite öffnet Save-Dialog mit leer-string
|
const result = await ExportPDF(weekPlan.id, '');
|
||||||
await ExportPDF(weekPlan.id, '');
|
setPdfSuccess(result || 'PDF wurde erfolgreich erstellt.');
|
||||||
setPdfSuccess('PDF wurde erfolgreich erstellt.');
|
|
||||||
|
|
||||||
// Success-Nachricht nach 5 Sekunden ausblenden
|
// Success-Nachricht nach 5 Sekunden ausblenden
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export function useProducts() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const productList = await GetProducts();
|
const productList = await GetProducts();
|
||||||
setProducts(productList);
|
setProducts(productList || []);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : 'Fehler beim Laden der Produkte');
|
setError(err instanceof Error ? err.message : 'Fehler beim Laden der Produkte');
|
||||||
} finally {
|
} finally {
|
||||||
@@ -35,8 +35,8 @@ export function useProducts() {
|
|||||||
GetAdditives()
|
GetAdditives()
|
||||||
]);
|
]);
|
||||||
|
|
||||||
setAllergens(allergenList);
|
setAllergens(allergenList || []);
|
||||||
setAdditives(additiveList);
|
setAdditives(additiveList || []);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : 'Fehler beim Laden der Stammdaten');
|
setError(err instanceof Error ? err.message : 'Fehler beim Laden der Stammdaten');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,11 @@ export function useWeekPlan(year: number, week: number) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const plan = await GetWeekPlan(year, week);
|
const plan = await GetWeekPlan(year, week);
|
||||||
|
// Null-Safety: Go kann null für leere Arrays zurückgeben
|
||||||
|
if (plan) {
|
||||||
|
plan.entries = plan.entries || [];
|
||||||
|
plan.special_days = plan.special_days || [];
|
||||||
|
}
|
||||||
setWeekPlan(plan);
|
setWeekPlan(plan);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : 'Fehler beim Laden des Wochenplans');
|
setError(err instanceof Error ? err.message : 'Fehler beim Laden des Wochenplans');
|
||||||
@@ -35,6 +40,10 @@ export function useWeekPlan(year: number, week: number) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const newPlan = await CreateWeekPlan(year, week);
|
const newPlan = await CreateWeekPlan(year, week);
|
||||||
|
if (newPlan) {
|
||||||
|
newPlan.entries = newPlan.entries || [];
|
||||||
|
newPlan.special_days = newPlan.special_days || [];
|
||||||
|
}
|
||||||
setWeekPlan(newPlan);
|
setWeekPlan(newPlan);
|
||||||
return newPlan;
|
return newPlan;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -52,6 +61,10 @@ export function useWeekPlan(year: number, week: number) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const copiedPlan = await CopyWeekPlan(srcYear, srcWeek, year, week);
|
const copiedPlan = await CopyWeekPlan(srcYear, srcWeek, year, week);
|
||||||
|
if (copiedPlan) {
|
||||||
|
copiedPlan.entries = copiedPlan.entries || [];
|
||||||
|
copiedPlan.special_days = copiedPlan.special_days || [];
|
||||||
|
}
|
||||||
setWeekPlan(copiedPlan);
|
setWeekPlan(copiedPlan);
|
||||||
return copiedPlan;
|
return copiedPlan;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -73,7 +86,15 @@ export function useWeekPlan(year: number, week: number) {
|
|||||||
if (!weekPlan) return null;
|
if (!weekPlan) return null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const newEntry = await AddPlanEntry(weekPlan.id, day, meal, productId, customText, groupLabel);
|
// Go erwartet null statt undefined für optionale Pointer-Parameter
|
||||||
|
const newEntry = await AddPlanEntry(
|
||||||
|
weekPlan.id,
|
||||||
|
day,
|
||||||
|
meal,
|
||||||
|
productId ?? null,
|
||||||
|
customText ?? null,
|
||||||
|
groupLabel ?? null
|
||||||
|
);
|
||||||
|
|
||||||
// State aktualisieren
|
// State aktualisieren
|
||||||
setWeekPlan(prev => prev ? {
|
setWeekPlan(prev => prev ? {
|
||||||
@@ -114,7 +135,8 @@ export function useWeekPlan(year: number, week: number) {
|
|||||||
groupLabel?: GroupLabel
|
groupLabel?: GroupLabel
|
||||||
): Promise<PlanEntry | null> => {
|
): Promise<PlanEntry | null> => {
|
||||||
try {
|
try {
|
||||||
const updatedEntry = await UpdatePlanEntry(entryId, 0, '', 0, productId ?? null, customText ?? null, groupLabel ?? null);
|
// Go: UpdatePlanEntry(id int, productID *int, customText *string, groupLabel *string)
|
||||||
|
const updatedEntry = await UpdatePlanEntry(entryId, productId ?? null, customText ?? null, groupLabel ?? null);
|
||||||
|
|
||||||
// State aktualisieren
|
// State aktualisieren
|
||||||
setWeekPlan(prev => prev ? {
|
setWeekPlan(prev => prev ? {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// Aktuelle Version der App
|
// Aktuelle Version der App
|
||||||
CurrentVersion = "0.4.3"
|
CurrentVersion = "0.4.5"
|
||||||
// Update-Check URL
|
// Update-Check URL
|
||||||
UpdateURL = "https://speiseplan.supertoll.xyz/version.json"
|
UpdateURL = "https://speiseplan.supertoll.xyz/version.json"
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user