251210:1709 Frontend: reeactor organization and run build
Some checks failed
Spec Validation / validate-markdown (push) Has been cancelled
Spec Validation / validate-diagrams (push) Has been cancelled
Spec Validation / check-todos (push) Has been cancelled

This commit is contained in:
admin
2025-12-10 17:09:11 +07:00
parent aa96cd90e3
commit c8a0f281ef
140 changed files with 3780 additions and 1473 deletions

View File

@@ -29,8 +29,8 @@ export function SequenceViewer() {
const filteredSequences = sequences.filter(s =>
s.year.toString().includes(search) ||
s.organization_code?.toLowerCase().includes(search.toLowerCase()) ||
s.discipline_code?.toLowerCase().includes(search.toLowerCase())
s.organizationCode?.toLowerCase().includes(search.toLowerCase()) ||
s.disciplineCode?.toLowerCase().includes(search.toLowerCase())
);
return (
@@ -57,26 +57,26 @@ export function SequenceViewer() {
)}
{filteredSequences.map((seq) => (
<div
key={seq.sequence_id}
key={seq.sequenceId}
className="flex items-center justify-between p-3 bg-slate-50 dark:bg-slate-900 rounded border"
>
<div>
<div className="flex items-center gap-2 mb-1">
<span className="font-medium">Year {seq.year}</span>
{seq.organization_code && (
<Badge>{seq.organization_code}</Badge>
{seq.organizationCode && (
<Badge>{seq.organizationCode}</Badge>
)}
{seq.discipline_code && (
<Badge variant="outline">{seq.discipline_code}</Badge>
{seq.disciplineCode && (
<Badge variant="outline">{seq.disciplineCode}</Badge>
)}
</div>
<div className="text-sm text-muted-foreground">
<span className="text-foreground font-medium">Current: {seq.current_number}</span> | Last Generated:{' '}
<span className="font-mono">{seq.last_generated_number}</span>
<span className="text-foreground font-medium">Current: {seq.currentNumber}</span> | Last Generated:{' '}
<span className="font-mono">{seq.lastGeneratedNumber}</span>
</div>
</div>
<div className="text-sm text-gray-500">
Updated {new Date(seq.updated_at).toLocaleDateString()}
Updated {new Date(seq.updatedAt).toLocaleDateString()}
</div>
</div>
))}

View File

@@ -52,11 +52,11 @@ export interface TemplateEditorProps {
}
export function TemplateEditor({ template, projectId, projectName, onSave, onCancel }: TemplateEditorProps) {
const [format, setFormat] = useState(template?.template_format || '');
const [docType, setDocType] = useState(template?.document_type_name || '');
const [discipline, setDiscipline] = useState(template?.discipline_code || '');
const [padding, setPadding] = useState(template?.padding_length || 4);
const [reset, setReset] = useState(template?.reset_annually ?? true);
const [format, setFormat] = useState(template?.templateFormat || '');
const [docType, setDocType] = useState(template?.documentTypeName || '');
const [discipline, setDiscipline] = useState(template?.disciplineCode || '');
const [padding, setPadding] = useState(template?.paddingLength || 4);
const [reset, setReset] = useState(template?.resetAnnually ?? true);
const [preview, setPreview] = useState('');
@@ -83,13 +83,13 @@ export function TemplateEditor({ template, projectId, projectName, onSave, onCan
const handleSave = () => {
onSave({
...template,
project_id: projectId, // Ensure project_id is included
template_format: format,
document_type_name: docType,
discipline_code: discipline || undefined,
padding_length: padding,
reset_annually: reset,
example_number: preview
projectId: projectId,
templateFormat: format,
documentTypeName: docType,
disciplineCode: discipline || undefined,
paddingLength: padding,
resetAnnually: reset,
exampleNumber: preview
});
};

View File

@@ -7,18 +7,12 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Label } from '@/components/ui/label';
import { Card } from '@/components/ui/card';
import { NumberingTemplate, numberingApi } from '@/lib/api/numbering';
import { Loader2 } from 'lucide-react';
import { Input } from '@/components/ui/input';
interface TemplateTesterProps {
open: boolean;
@@ -28,18 +22,22 @@ interface TemplateTesterProps {
export function TemplateTester({ open, onOpenChange, template }: TemplateTesterProps) {
const [testData, setTestData] = useState({
organization_id: '1',
discipline_id: '1',
organizationId: "1",
disciplineId: "1",
year: new Date().getFullYear(),
});
const [generatedNumber, setGeneratedNumber] = useState('');
const [loading, setLoading] = useState(false);
const handleTest = async () => {
const handleGenerate = async () => {
if (!template) return;
setLoading(true);
try {
const result = await numberingApi.generateTestNumber(template.template_id, testData);
// Note: generateTestNumber expects keys: organizationId, disciplineId
const result = await numberingApi.generateTestNumber(template.templateId, {
organizationId: testData.organizationId,
disciplineId: testData.disciplineId
});
setGeneratedNumber(result.number);
} finally {
setLoading(false);
@@ -54,38 +52,42 @@ export function TemplateTester({ open, onOpenChange, template }: TemplateTesterP
</DialogHeader>
<div className="text-sm text-muted-foreground mb-2">
Template: <span className="font-mono font-bold text-foreground">{template?.template_format}</span>
Template: <span className="font-mono font-bold text-foreground">{template?.templateFormat}</span>
</div>
<div className="space-y-4">
<div>
<Label>Organization (Mock Context)</Label>
<Select value={testData.organization_id} onValueChange={v => setTestData({...testData, organization_id: v})}>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="1">Port Authority (PAT/)</SelectItem>
<SelectItem value="2">Contractor (CN/)</SelectItem>
</SelectContent>
</Select>
</div>
<Card className="p-6 mt-6 bg-muted/50 rounded-lg">
<h3 className="text-lg font-semibold mb-4">Template Tester</h3>
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div>
<h4 className="text-sm font-medium mb-2">Test Parameters</h4>
<div className="space-y-4">
<div className="grid grid-cols-2 gap-4">
<div className="space-y-2">
<label className="text-xs font-medium">Organization</label>
<Input
value={testData.organizationId}
onChange={(e) => setTestData({...testData, organizationId: e.target.value})}
placeholder="Org ID"
/>
</div>
<div className="space-y-2">
<label className="text-xs font-medium">Discipline</label>
<Input
value={testData.disciplineId}
onChange={(e) => setTestData({...testData, disciplineId: e.target.value})}
placeholder="Disc ID"
/>
</div>
</div>
<p className="text-xs text-muted-foreground">
Format: {template?.templateFormat}
</p>
</div>
</div>
</div>
</Card>
<div>
<Label>Discipline (Mock Context)</Label>
<Select value={testData.discipline_id} onValueChange={v => setTestData({...testData, discipline_id: v})}>
<SelectTrigger>
<SelectValue placeholder="Select discipline" />
</SelectTrigger>
<SelectContent>
<SelectItem value="1">Structure (STR)</SelectItem>
<SelectItem value="2">Architecture (ARC)</SelectItem>
<SelectItem value="3">General (GEN)</SelectItem>
</SelectContent>
</Select>
</div>
<Button onClick={handleTest} className="w-full" disabled={loading || !template}>
<Button onClick={handleGenerate} className="w-full" disabled={loading || !template}>
{loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
Generate Test Number
</Button>
@@ -98,7 +100,7 @@ export function TemplateTester({ open, onOpenChange, template }: TemplateTesterP
</p>
</Card>
)}
</div>
</DialogContent>
</Dialog>
);