Compare commits
8 Commits
mai/knuth/
...
d38719db2f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d38719db2f | ||
|
|
b21efccfb5 | ||
|
|
f51d189a3b | ||
|
|
481b299e03 | ||
|
|
40a11a4c49 | ||
|
|
eca0cde5e7 | ||
|
|
cf3711b2e4 | ||
|
|
dea49f6f8e |
@@ -20,6 +20,7 @@ type UserTenant struct {
|
|||||||
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
||||||
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
||||||
Role string `db:"role" json:"role"`
|
Role string `db:"role" json:"role"`
|
||||||
|
Email string `db:"email" json:"email"`
|
||||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -458,17 +459,25 @@ type UpdatePreferencesInput struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// SendEmail sends an email using the `m mail send` CLI command.
|
// SendEmail sends an email using the `m mail send` CLI command.
|
||||||
|
// In Docker, this will fail gracefully (m CLI not available).
|
||||||
|
// TODO: Replace with direct SMTP for production.
|
||||||
func SendEmail(to, subject, body string) error {
|
func SendEmail(to, subject, body string) error {
|
||||||
|
from := os.Getenv("MAIL_FROM")
|
||||||
|
if from == "" {
|
||||||
|
from = "mgmt@msbls.de"
|
||||||
|
}
|
||||||
cmd := exec.Command("m", "mail", "send",
|
cmd := exec.Command("m", "mail", "send",
|
||||||
|
"--from", from,
|
||||||
"--to", to,
|
"--to", to,
|
||||||
"--subject", subject,
|
"--subject", subject,
|
||||||
"--body", body,
|
"--body", body,
|
||||||
"--yes")
|
"--yes")
|
||||||
output, err := cmd.CombinedOutput()
|
output, err := cmd.CombinedOutput()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("m mail send failed: %w (output: %s)", err, string(output))
|
slog.Warn("email send failed (m CLI may not be available in Docker)", "to", to, "error", err, "output", string(output))
|
||||||
|
return fmt.Errorf("m mail send failed: %w", err)
|
||||||
}
|
}
|
||||||
slog.Info("email sent", "to", to, "subject", subject)
|
slog.Info("email sent", "from", from, "to", to, "subject", subject)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,11 @@ func (s *TenantService) FirstTenantForUser(ctx context.Context, userID uuid.UUID
|
|||||||
func (s *TenantService) ListMembers(ctx context.Context, tenantID uuid.UUID) ([]models.UserTenant, error) {
|
func (s *TenantService) ListMembers(ctx context.Context, tenantID uuid.UUID) ([]models.UserTenant, error) {
|
||||||
var members []models.UserTenant
|
var members []models.UserTenant
|
||||||
err := s.db.SelectContext(ctx, &members,
|
err := s.db.SelectContext(ctx, &members,
|
||||||
`SELECT user_id, tenant_id, role, created_at FROM user_tenants WHERE tenant_id = $1 ORDER BY created_at`,
|
`SELECT ut.user_id, ut.tenant_id, ut.role, ut.created_at, COALESCE(au.email, '') as email
|
||||||
|
FROM user_tenants ut
|
||||||
|
LEFT JOIN auth.users au ON au.id = ut.user_id
|
||||||
|
WHERE ut.tenant_id = $1
|
||||||
|
ORDER BY ut.created_at`,
|
||||||
tenantID,
|
tenantID,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
-- Creates 1 test tenant, 5 cases with deadlines and appointments
|
-- Creates 1 test tenant, 5 cases with deadlines and appointments
|
||||||
-- Run with: psql $DATABASE_URL -f demo_data.sql
|
-- Run with: psql $DATABASE_URL -f demo_data.sql
|
||||||
|
|
||||||
SET search_path TO kanzlai, public;
|
SET search_path TO mgmt, public;
|
||||||
|
|
||||||
-- Demo tenant
|
-- Demo tenant
|
||||||
INSERT INTO tenants (id, name, slug, settings) VALUES
|
INSERT INTO tenants (id, name, slug, settings) VALUES
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
-- UPC Proceeding Timeline: Full event tree with conditional deadlines
|
-- UPC Proceeding Timeline: Full event tree with conditional deadlines
|
||||||
-- Ported from youpc.org migrations 039 + 040
|
-- Ported from youpc.org migrations 039 + 040
|
||||||
-- Run against kanzlai schema in flexsiebels Supabase instance
|
-- Run against mgmt schema in youpc.org Supabase instance
|
||||||
|
|
||||||
-- ========================================
|
-- ========================================
|
||||||
-- 1. Add is_spawn + spawn_label columns
|
-- 1. Add is_spawn + spawn_label columns
|
||||||
|
|||||||
@@ -1,16 +1,14 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
import { useQuery } from "@tanstack/react-query";
|
||||||
|
import { api } from "@/lib/api";
|
||||||
|
import type { ProceedingType } from "@/lib/types";
|
||||||
|
|
||||||
const TYPE_OPTIONS = [
|
const JURISDICTION_LABELS: Record<string, string> = {
|
||||||
{ value: "", label: "-- Typ wählen --" },
|
UPC: "UPC-Verfahren",
|
||||||
{ value: "INF", label: "Verletzungsklage (INF)" },
|
DE: "Deutsche Patentverfahren",
|
||||||
{ value: "REV", label: "Widerruf (REV)" },
|
};
|
||||||
{ value: "CCR", label: "Einstweilige Verfügung (CCR)" },
|
|
||||||
{ value: "APP", label: "Berufung (APP)" },
|
|
||||||
{ value: "PI", label: "Vorläufiger Rechtsschutz (PI)" },
|
|
||||||
{ value: "ZPO_CIVIL", label: "ZPO Zivilverfahren" },
|
|
||||||
];
|
|
||||||
|
|
||||||
export interface CaseFormData {
|
export interface CaseFormData {
|
||||||
case_number: string;
|
case_number: string;
|
||||||
@@ -34,6 +32,10 @@ export function CaseForm({
|
|||||||
isSubmitting,
|
isSubmitting,
|
||||||
submitLabel = "Akte anlegen",
|
submitLabel = "Akte anlegen",
|
||||||
}: CaseFormProps) {
|
}: CaseFormProps) {
|
||||||
|
const { data: proceedingTypes } = useQuery({
|
||||||
|
queryKey: ["proceeding-types"],
|
||||||
|
queryFn: () => api.get<ProceedingType[]>("/proceeding-types"),
|
||||||
|
});
|
||||||
const [form, setForm] = useState<CaseFormData>({
|
const [form, setForm] = useState<CaseFormData>({
|
||||||
case_number: initialData?.case_number ?? "",
|
case_number: initialData?.case_number ?? "",
|
||||||
title: initialData?.title ?? "",
|
title: initialData?.title ?? "",
|
||||||
@@ -139,11 +141,24 @@ export function CaseForm({
|
|||||||
onChange={(e) => update("case_type", e.target.value)}
|
onChange={(e) => update("case_type", e.target.value)}
|
||||||
className={inputClass}
|
className={inputClass}
|
||||||
>
|
>
|
||||||
{TYPE_OPTIONS.map((o) => (
|
<option value="">-- Typ wählen --</option>
|
||||||
<option key={o.value} value={o.value}>
|
{(() => {
|
||||||
{o.label}
|
const grouped = new Map<string, ProceedingType[]>();
|
||||||
|
for (const pt of proceedingTypes ?? []) {
|
||||||
|
const key = pt.jurisdiction ?? "Sonstige";
|
||||||
|
if (!grouped.has(key)) grouped.set(key, []);
|
||||||
|
grouped.get(key)!.push(pt);
|
||||||
|
}
|
||||||
|
return Array.from(grouped.entries()).map(([jurisdiction, types]) => (
|
||||||
|
<optgroup key={jurisdiction} label={JURISDICTION_LABELS[jurisdiction] ?? jurisdiction}>
|
||||||
|
{types.map((pt) => (
|
||||||
|
<option key={pt.id} value={pt.code}>
|
||||||
|
{pt.name} ({pt.code})
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
|
</optgroup>
|
||||||
|
));
|
||||||
|
})()}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -85,11 +85,27 @@ export function DeadlineCalculator() {
|
|||||||
className={inputClass}
|
className={inputClass}
|
||||||
>
|
>
|
||||||
<option value="">Bitte wählen...</option>
|
<option value="">Bitte wählen...</option>
|
||||||
{proceedingTypes?.map((pt) => (
|
{(() => {
|
||||||
|
const grouped = new Map<string, ProceedingType[]>();
|
||||||
|
for (const pt of proceedingTypes ?? []) {
|
||||||
|
const key = pt.jurisdiction ?? "Sonstige";
|
||||||
|
if (!grouped.has(key)) grouped.set(key, []);
|
||||||
|
grouped.get(key)!.push(pt);
|
||||||
|
}
|
||||||
|
const labels: Record<string, string> = {
|
||||||
|
UPC: "UPC-Verfahren",
|
||||||
|
DE: "Deutsche Patentverfahren",
|
||||||
|
};
|
||||||
|
return Array.from(grouped.entries()).map(([jurisdiction, types]) => (
|
||||||
|
<optgroup key={jurisdiction} label={labels[jurisdiction] ?? jurisdiction}>
|
||||||
|
{types.map((pt) => (
|
||||||
<option key={pt.id} value={pt.code}>
|
<option key={pt.id} value={pt.code}>
|
||||||
{pt.name} ({pt.code})
|
{pt.name} ({pt.code})
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
|
</optgroup>
|
||||||
|
));
|
||||||
|
})()}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -276,13 +276,30 @@ export function DeadlineWizard() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mt-4 grid grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6">
|
<div className="mt-4 space-y-4">
|
||||||
{typesLoading ? (
|
{typesLoading ? (
|
||||||
<div className="col-span-full flex justify-center py-4">
|
<div className="flex justify-center py-4">
|
||||||
<Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
|
<Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
proceedingTypes?.map((pt) => (
|
(() => {
|
||||||
|
const grouped = new Map<string, ProceedingType[]>();
|
||||||
|
for (const pt of proceedingTypes ?? []) {
|
||||||
|
const key = pt.jurisdiction ?? "Sonstige";
|
||||||
|
if (!grouped.has(key)) grouped.set(key, []);
|
||||||
|
grouped.get(key)!.push(pt);
|
||||||
|
}
|
||||||
|
const labels: Record<string, string> = {
|
||||||
|
UPC: "UPC-Verfahren",
|
||||||
|
DE: "Deutsche Patentverfahren",
|
||||||
|
};
|
||||||
|
return Array.from(grouped.entries()).map(([jurisdiction, types]) => (
|
||||||
|
<div key={jurisdiction}>
|
||||||
|
<div className="mb-2 text-xs font-medium text-neutral-500">
|
||||||
|
{labels[jurisdiction] ?? jurisdiction}
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6">
|
||||||
|
{types.map((pt) => (
|
||||||
<button
|
<button
|
||||||
key={pt.id}
|
key={pt.id}
|
||||||
onClick={() => handleTypeSelect(pt.code)}
|
onClick={() => handleTypeSelect(pt.code)}
|
||||||
@@ -301,7 +318,11 @@ export function DeadlineWizard() {
|
|||||||
</div>
|
</div>
|
||||||
<div className="mt-1 text-xs leading-tight opacity-80">{pt.name}</div>
|
<div className="mt-1 text-xs leading-tight opacity-80">{pt.name}</div>
|
||||||
</button>
|
</button>
|
||||||
))
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
));
|
||||||
|
})()
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -444,7 +465,7 @@ export function DeadlineWizard() {
|
|||||||
<Scale className="h-6 w-6 text-neutral-400" />
|
<Scale className="h-6 w-6 text-neutral-400" />
|
||||||
</div>
|
</div>
|
||||||
<p className="mt-3 text-sm font-medium text-neutral-700">
|
<p className="mt-3 text-sm font-medium text-neutral-700">
|
||||||
UPC-Fristenbestimmung
|
Fristenbestimmung
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-1 max-w-sm text-xs text-neutral-500">
|
<p className="mt-1 max-w-sm text-xs text-neutral-500">
|
||||||
Waehlen Sie die Verfahrensart und geben Sie das Datum des ausloesenden Ereignisses ein.
|
Waehlen Sie die Verfahrensart und geben Sie das Datum des ausloesenden Ereignisses ein.
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ export function TeamSettings() {
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<p className="text-sm font-medium text-neutral-900">
|
<p className="text-sm font-medium text-neutral-900">
|
||||||
{member.user_id.slice(0, 8)}...
|
{member.email || member.user_id.slice(0, 8) + "..."}
|
||||||
</p>
|
</p>
|
||||||
<p className="text-xs text-neutral-500">{roleInfo.label}</p>
|
<p className="text-xs text-neutral-500">{roleInfo.label}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ export interface UserTenant {
|
|||||||
user_id: string;
|
user_id: string;
|
||||||
tenant_id: string;
|
tenant_id: string;
|
||||||
role: string;
|
role: string;
|
||||||
|
email: string;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user