Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
80cb152b73 | ||
|
|
919642a189 | ||
|
|
3f9a043324 | ||
|
|
4ee35e6336 | ||
|
|
fc7fad9713 |
14
app.go
14
app.go
@@ -373,6 +373,20 @@ func (a *App) DownloadUpdate() (string, error) {
|
||||
return a.updater.DownloadUpdate(*info)
|
||||
}
|
||||
|
||||
// PDF EXPORT
|
||||
|
||||
// ExportPDF erstellt eine PDF-Datei des Wochenplans
|
||||
// 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
|
||||
|
||||
// loadProductRelations lädt Allergene und Zusatzstoffe für ein Produkt
|
||||
|
||||
@@ -75,7 +75,7 @@ Section "Uninstall"
|
||||
; Datenbank löschen
|
||||
MessageBox MB_YESNO "Sollen die gespeicherten Daten (Speisepläne, Produkte) ebenfalls gelöscht werden?" IDYES deletedata IDNO skipdata
|
||||
deletedata:
|
||||
Delete "$PROFILE\speiseplan.db"
|
||||
RMDir /r "$LOCALAPPDATA\Speiseplan"
|
||||
skipdata:
|
||||
|
||||
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan"
|
||||
|
||||
13
db.go
13
db.go
@@ -13,13 +13,18 @@ var db *sqlx.DB
|
||||
|
||||
// InitDatabase initialisiert die SQLite-Datenbank
|
||||
func InitDatabase() error {
|
||||
// DB-Datei im User-Home-Verzeichnis
|
||||
homeDir, err := os.UserHomeDir()
|
||||
// DB-Datei in AppData/Local/Speiseplan
|
||||
configDir, err := os.UserConfigDir()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get user home directory: %w", err)
|
||||
return fmt.Errorf("failed to get config directory: %w", err)
|
||||
}
|
||||
|
||||
dbPath := filepath.Join(homeDir, "speiseplan.db")
|
||||
appDir := filepath.Join(configDir, "Speiseplan")
|
||||
if err := os.MkdirAll(appDir, 0755); err != nil {
|
||||
return fmt.Errorf("failed to create app directory: %w", err)
|
||||
}
|
||||
|
||||
dbPath := filepath.Join(appDir, "speiseplan.db")
|
||||
|
||||
// Verbindung zur Datenbank herstellen
|
||||
database, err := sqlx.Open("sqlite", dbPath)
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Layout, useSelectedWeek } from './components/Layout';
|
||||
import { WeekPlanner } from './components/WeekPlanner';
|
||||
import { ProductList } from './components/ProductList';
|
||||
import { InfoPage } from './components/InfoPage';
|
||||
import { ErrorBoundary } from './components/ErrorBoundary';
|
||||
import { useProducts } from './hooks/useProducts';
|
||||
import './styles/globals.css';
|
||||
|
||||
@@ -68,6 +69,7 @@ function ProductsPage() {
|
||||
// Main App Component
|
||||
function App() {
|
||||
return (
|
||||
<ErrorBoundary>
|
||||
<Router>
|
||||
<div className="App min-h-screen bg-gray-50 text-contrast-aa">
|
||||
<Routes>
|
||||
@@ -87,6 +89,7 @@ function App() {
|
||||
</Routes>
|
||||
</div>
|
||||
</Router>
|
||||
</ErrorBoundary>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
58
frontend/src/components/ErrorBoundary.tsx
Normal file
58
frontend/src/components/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,58 @@
|
||||
import { Component, ErrorInfo, ReactNode } from 'react';
|
||||
|
||||
interface Props {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
interface State {
|
||||
hasError: boolean;
|
||||
error: Error | null;
|
||||
}
|
||||
|
||||
export class ErrorBoundary extends Component<Props, State> {
|
||||
constructor(props: Props) {
|
||||
super(props);
|
||||
this.state = { hasError: false, error: null };
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(error: Error): State {
|
||||
return { hasError: true, error };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
console.error('ErrorBoundary caught:', error, errorInfo);
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center bg-gray-50 p-8">
|
||||
<div className="text-center max-w-md">
|
||||
<svg className="mx-auto h-16 w-16 text-red-400 mb-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.996-.833-2.764 0L3.732 16c-.77.833.192 2.5 1.732 2.5z" />
|
||||
</svg>
|
||||
<h1 className="text-2xl font-bold text-gray-900 mb-2">
|
||||
Etwas ist schiefgelaufen
|
||||
</h1>
|
||||
<p className="text-gray-600 mb-6">
|
||||
Ein unerwarteter Fehler ist aufgetreten. Bitte laden Sie die Seite neu.
|
||||
</p>
|
||||
{this.state.error && (
|
||||
<p className="text-sm text-red-600 mb-6 font-mono bg-red-50 p-3 rounded">
|
||||
{this.state.error.message}
|
||||
</p>
|
||||
)}
|
||||
<button
|
||||
onClick={() => window.location.reload()}
|
||||
className="px-6 py-3 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition-colors text-lg"
|
||||
>
|
||||
Seite neu laden
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
@@ -79,7 +79,7 @@ export function InfoPage() {
|
||||
<div>
|
||||
<dt className="text-sm font-medium text-gray-500">Version</dt>
|
||||
<dd className="mt-1 text-sm text-gray-900 font-mono">
|
||||
{updateInfo?.current_version || '1.0.0'}
|
||||
{updateInfo?.current_version || '0.4.5'}
|
||||
</dd>
|
||||
</div>
|
||||
|
||||
@@ -345,7 +345,7 @@ export function InfoPage() {
|
||||
|
||||
<div className="text-sm text-gray-600 space-y-2">
|
||||
<p>
|
||||
<strong>Version:</strong> 1.0.0 (Build 2026.02.20)
|
||||
<strong>Version:</strong> 0.4.5 (Build 2026.02.20)
|
||||
</p>
|
||||
<p>
|
||||
<strong>Support:</strong> Wenden Sie sich bei Fragen oder Problemen an Ihre IT-Abteilung
|
||||
|
||||
@@ -85,7 +85,6 @@ export function WeekPlanner({ year, week, className = '' }: WeekPlannerProps) {
|
||||
setPdfSuccess(null);
|
||||
|
||||
try {
|
||||
// ExportPDF nimmt weekPlanID und outputPath - Go-Seite öffnet Save-Dialog mit leer-string
|
||||
await ExportPDF(weekPlan.id, '');
|
||||
setPdfSuccess('PDF wurde erfolgreich erstellt.');
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ export function useProducts() {
|
||||
|
||||
try {
|
||||
const productList = await GetProducts();
|
||||
setProducts(productList);
|
||||
setProducts(productList || []);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Laden der Produkte');
|
||||
} finally {
|
||||
@@ -35,8 +35,8 @@ export function useProducts() {
|
||||
GetAdditives()
|
||||
]);
|
||||
|
||||
setAllergens(allergenList);
|
||||
setAdditives(additiveList);
|
||||
setAllergens(allergenList || []);
|
||||
setAdditives(additiveList || []);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Laden der Stammdaten');
|
||||
}
|
||||
@@ -66,7 +66,9 @@ export function useProducts() {
|
||||
data.additiveIds
|
||||
);
|
||||
|
||||
if (newProduct) {
|
||||
setProducts(prev => [...prev, newProduct]);
|
||||
}
|
||||
return newProduct;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Erstellen des Produkts');
|
||||
@@ -90,7 +92,9 @@ export function useProducts() {
|
||||
data.additiveIds
|
||||
);
|
||||
|
||||
if (updatedProduct) {
|
||||
setProducts(prev => prev.map(p => p.id === id ? updatedProduct : p));
|
||||
}
|
||||
return updatedProduct;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Bearbeiten des Produkts');
|
||||
|
||||
@@ -19,6 +19,11 @@ export function useWeekPlan(year: number, week: number) {
|
||||
|
||||
try {
|
||||
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);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Laden des Wochenplans');
|
||||
@@ -35,6 +40,10 @@ export function useWeekPlan(year: number, week: number) {
|
||||
|
||||
try {
|
||||
const newPlan = await CreateWeekPlan(year, week);
|
||||
if (newPlan) {
|
||||
newPlan.entries = newPlan.entries || [];
|
||||
newPlan.special_days = newPlan.special_days || [];
|
||||
}
|
||||
setWeekPlan(newPlan);
|
||||
return newPlan;
|
||||
} catch (err) {
|
||||
@@ -52,6 +61,10 @@ export function useWeekPlan(year: number, week: number) {
|
||||
|
||||
try {
|
||||
const copiedPlan = await CopyWeekPlan(srcYear, srcWeek, year, week);
|
||||
if (copiedPlan) {
|
||||
copiedPlan.entries = copiedPlan.entries || [];
|
||||
copiedPlan.special_days = copiedPlan.special_days || [];
|
||||
}
|
||||
setWeekPlan(copiedPlan);
|
||||
return copiedPlan;
|
||||
} catch (err) {
|
||||
@@ -73,13 +86,22 @@ export function useWeekPlan(year: number, week: number) {
|
||||
if (!weekPlan) return null;
|
||||
|
||||
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
|
||||
if (newEntry) {
|
||||
setWeekPlan(prev => prev ? {
|
||||
...prev,
|
||||
entries: [...prev.entries, newEntry]
|
||||
} : null);
|
||||
}
|
||||
|
||||
return newEntry;
|
||||
} catch (err) {
|
||||
@@ -114,13 +136,15 @@ export function useWeekPlan(year: number, week: number) {
|
||||
groupLabel?: GroupLabel
|
||||
): Promise<PlanEntry | null> => {
|
||||
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
|
||||
if (updatedEntry) {
|
||||
setWeekPlan(prev => prev ? {
|
||||
...prev,
|
||||
entries: prev.entries.map(e => e.id === entryId ? updatedEntry : e)
|
||||
} : null);
|
||||
}
|
||||
|
||||
return updatedEntry;
|
||||
} catch (err) {
|
||||
|
||||
@@ -16,7 +16,7 @@ import (
|
||||
|
||||
const (
|
||||
// Aktuelle Version der App
|
||||
CurrentVersion = "1.0.0"
|
||||
CurrentVersion = "0.4.5"
|
||||
// Update-Check URL
|
||||
UpdateURL = "https://speiseplan.supertoll.xyz/version.json"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user