diff --git a/backend/src/db.js b/backend/src/db.js index 4dca2e0..6fcb851 100644 --- a/backend/src/db.js +++ b/backend/src/db.js @@ -246,4 +246,18 @@ if (msgCols2.length && !msgCols2.includes('read_by_recipient')) { db.exec("ALTER TABLE messages ADD COLUMN read_by_recipient INTEGER NOT NULL DEFAULT 0"); } +// ── Kalkulator-Shares ───────────────────────────────────────────────────────── +if (!db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='calculation_shares'").get()) { + db.exec(` + CREATE TABLE calculation_shares ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + calc_id INTEGER NOT NULL REFERENCES calculations(id) ON DELETE CASCADE, + shared_by INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + shared_with INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + created_at DATETIME DEFAULT NULL, + UNIQUE(calc_id, shared_with) + ) + `); +} + module.exports = db; diff --git a/backend/src/tools/kalkulator3d/routes.js b/backend/src/tools/kalkulator3d/routes.js index fc6eb1f..298f50c 100644 --- a/backend/src/tools/kalkulator3d/routes.js +++ b/backend/src/tools/kalkulator3d/routes.js @@ -8,24 +8,62 @@ router.get('/', authenticate, (req, res) => { const uid = req.user.id; const items = db.prepare('SELECT * FROM calculations WHERE user_id=? ORDER BY created_at DESC').all(uid); - // Prüfen welche Modelle Dateien haben: Unterordner von "3D-Modelle" mit Dateien const baseFolder = db.prepare( "SELECT id FROM folders WHERE user_id=? AND name='3D-Modelle' AND parent_id IS NULL" ).get(uid); - let filesMap = {}; if (baseFolder) { const rows = db.prepare(` - SELECT f.name, COUNT(fi.id) AS cnt - FROM folders f + SELECT f.name, COUNT(fi.id) AS cnt FROM folders f LEFT JOIN files fi ON fi.folder_id = f.id - WHERE f.parent_id = ? AND f.user_id = ? - GROUP BY f.id + WHERE f.parent_id = ? AND f.user_id = ? GROUP BY f.id `).all(baseFolder.id, uid); for (const r of rows) filesMap[r.name] = r.cnt > 0; } - res.json(items.map(i => ({ ...i, has_files: !!filesMap[i.name] }))); + // Geteilt mit mir + const shared = db.prepare(` + SELECT c.*, u.username as owner_name, 1 as is_shared + FROM calculations c + JOIN calculation_shares cs ON cs.calc_id = c.id + JOIN users u ON u.id = c.user_id + WHERE cs.shared_with = ? + ORDER BY c.created_at DESC + `).all(uid); + + res.json({ + own: items.map(i => ({ ...i, has_files: !!filesMap[i.name] })), + shared: shared, + }); +}); + +// Share-Management +router.get('/:id/shares', authenticate, (req, res) => { + const calc = db.prepare('SELECT * FROM calculations WHERE id=? AND user_id=?').get(req.params.id, req.user.id); + if (!calc) return res.status(404).json({ error: 'Nicht gefunden' }); + res.json(db.prepare(` + SELECT u.id, u.username, cs.created_at as shared_at + FROM calculation_shares cs JOIN users u ON u.id = cs.shared_with + WHERE cs.calc_id = ? + `).all(calc.id)); +}); + +router.post('/:id/share', authenticate, (req, res) => { + const calc = db.prepare('SELECT * FROM calculations WHERE id=? AND user_id=?').get(req.params.id, req.user.id); + if (!calc) return res.status(404).json({ error: 'Nicht gefunden' }); + const target = db.prepare('SELECT * FROM users WHERE username=?').get(req.body.username); + if (!target) return res.status(404).json({ error: 'Benutzer nicht gefunden' }); + if (target.id === req.user.id) return res.status(400).json({ error: 'Kann nicht mit dir selbst teilen' }); + db.prepare("INSERT OR IGNORE INTO calculation_shares (calc_id, shared_by, shared_with, created_at) VALUES (?,?,?,datetime('now','localtime'))") + .run(calc.id, req.user.id, target.id); + res.json({ ok: true }); +}); + +router.delete('/:id/share/:userId', authenticate, (req, res) => { + const calc = db.prepare('SELECT * FROM calculations WHERE id=? AND user_id=?').get(req.params.id, req.user.id); + if (!calc) return res.status(404).json({ error: 'Nicht gefunden' }); + db.prepare('DELETE FROM calculation_shares WHERE calc_id=? AND shared_with=?').run(calc.id, req.params.userId); + res.json({ ok: true }); }); router.post('/', authenticate, (req, res) => { diff --git a/frontend/src/tools/bestellungen.jsx b/frontend/src/tools/bestellungen.jsx index 95566f1..390469b 100644 --- a/frontend/src/tools/bestellungen.jsx +++ b/frontend/src/tools/bestellungen.jsx @@ -284,6 +284,7 @@ function BestellungDetail({ id, toast, onBack }) {
FESTPREIS/STK (€)
api(`/tools/kalkulator3d/${item.id}/shares`).then(setShares).catch(()=>{}); + useEffect(()=>{ load(); },[]); + const share = async () => { + if (!username.trim()) return; + try { await api(`/tools/kalkulator3d/${item.id}/share`,{body:{username:username.trim()}}); toast('Geteilt ✓'); setUsername(''); load(); } + catch(e) { toast(e.message,'error'); } + }; + const unshare = async uid => { + try { await api(`/tools/kalkulator3d/${item.id}/share/${uid}`,{method:'DELETE'}); setShares(p=>p.filter(s=>s.id!==uid)); toast('Freigabe entfernt'); } + catch(e) { toast(e.message,'error'); } + }; + const isMobile = window.innerWidth<768; + return ( +
e.target===e.currentTarget&&onClose()}> +
+ {isMobile&&
} +
+
+ 🖨 {item.name} +
+ +
+

+ Empfänger können das Modell nur ansehen, nicht bearbeiten oder löschen. +

+
+ setUsername(e.target.value)} onKeyDown={e=>e.key==='Enter'&&share()} + placeholder="Benutzername" autoCapitalize="none" style={{...S.inp,flex:1,fontSize:15}}/> + +
+ {shares.length>0 ? ( +
+
GETEILT MIT
+ {shares.map(s=>( +
+
+
{s.username}
+ {s.shared_at &&
seit {new Date(s.shared_at.replace(' ','T')).toLocaleDateString('de-DE')}
} +
+ +
+ ))} +
+ ) : ( +
Noch mit niemandem geteilt.
+ )} +
+
+ ); +} + export function SavedList({ toast, mobile }) { const { confirm, ConfirmDialog } = useConfirm(); - const [items, setItems] = useState([]); + const [own, setOwn] = useState([]); + const [shared, setShared] = useState([]); const [loading, setLoading] = useState(true); - const [delId, setDelId] = useState(null); + const [tab, setTab] = useState('own'); const [editData, setEditData] = useState(null); const [search, setSearch] = useState(''); const [lightbox, setLightbox] = useState(null); + const [shareItem,setShareItem]= useState(null); - useEffect(() => { - api('/tools/kalkulator3d').then(setItems).catch(e => toast(e.message, 'error')).finally(() => setLoading(false)); - }, []); + const load = () => { + setLoading(true); + api('/tools/kalkulator3d') + .then(d => { setOwn(d.own||[]); setShared(d.shared||[]); }) + .catch(e => toast(e.message,'error')) + .finally(()=>setLoading(false)); + }; + useEffect(()=>{ load(); },[]); const del = async id => { - try { await api(`/tools/kalkulator3d/${id}`, { method:'DELETE' }); setItems(p => p.filter(i => i.id !== id)); toast('Gelöscht'); } - catch(e) { toast(e.message, 'error'); } finally { setDelId(null); } + try { await api(`/tools/kalkulator3d/${id}`,{method:'DELETE'}); setOwn(p=>p.filter(i=>i.id!==id)); toast('Gelöscht'); } + catch(e) { toast(e.message,'error'); } }; + const items = tab==='own' ? own : shared; const filtered = search.trim() - ? items.filter(i => - i.name.toLowerCase().includes(search.toLowerCase()) || - (i.bemerkung && i.bemerkung.toLowerCase().includes(search.toLowerCase())) - ) + ? items.filter(i => i.name.toLowerCase().includes(search.toLowerCase()) || (i.bemerkung&&i.bemerkung.toLowerCase().includes(search.toLowerCase()))) : items; if (editData) return ( - { - setEditData(null); - api('/tools/kalkulator3d').then(setItems).catch(() => {}); - }} /> + { setEditData(null); load(); }} /> ); return (
{lightbox && setLightbox(null)} />} + {shareItem && {setShareItem(null);load();}} toast={toast}/>} +

Archiv

-
+ + {/* Tabs */} +
+ {[['own','Meine',own.length],['shared','Geteilt mit mir',shared.length]].map(([k,l,cnt])=>( + + ))} +
{/* Suche */}
- - + {!item.is_shared ? ( + <> + + + + + ) : ( +
+ von {item.owner_name} · nur Ansicht +
+ )}
))}