np-dms/lcbp3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

260321:1700 Correct Coresspondence / Doing RFA

Browse Source
This commit is contained in:
admin
2026-03-21 17:00:41 +07:00
parent dcf55f4d08
commit 03d16cfd64
57 changed files with 1923 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/numbering/template-editor.tsx
+18
View File
@@ -56,6 +56,7 @@ export function TemplateEditor({
}: TemplateEditorProps) {
const [format, setFormat] = useState(template?.formatTemplate || '');
const [typeId, setTypeId] = useState<string>(template?.correspondenceTypeId?.toString() || '');
const [disciplineId, setDisciplineId] = useState<string>(template?.disciplineId?.toString() || '0');
const [reset, setReset] = useState(template?.resetSequenceYearly ?? true);
const [preview, setPreview] = useState('');
@@ -89,6 +90,7 @@ export function TemplateEditor({
...template,
projectId: projectId,
correspondenceTypeId: typeId && typeId !== '__default__' ? Number(typeId) : null,
disciplineId: Number(disciplineId),
formatTemplate: format,
resetSequenceYearly: reset,
});
@@ -139,6 +141,22 @@ export function TemplateEditor({
</div>
<div className="grid grid-cols-2 gap-4">
<div>
<Label>Discipline (Optional)</Label>
<Select value={disciplineId} onValueChange={setDisciplineId}>
<SelectTrigger>
<SelectValue placeholder="All Disciplines" />
</SelectTrigger>
<SelectContent>
<SelectItem value="0">All Disciplines</SelectItem>
{disciplines.map((d: any) => (
<SelectItem key={d.id} value={d.id.toString()}>
{d.disciplineCode} - {d.codeNameEn || d.codeNameTh}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div>
<Label>Reset Rule</Label>
<div className="flex items-center h-10">
frontend/components/numbering/template-tester.tsx
+35 -12
View File
@@ -11,6 +11,7 @@ import {
import { Button } from '@/components/ui/button';
import { Card } from '@/components/ui/card';
import { NumberingTemplate, numberingApi } from '@/lib/api/numbering';
import { Badge } from '@/components/ui/badge';
import { Loader2 } from 'lucide-react';
import {
Select,
@@ -49,7 +50,7 @@ export function TemplateTester({ open, onOpenChange, template }: TemplateTesterP
disciplineId: "",
year: new Date().getFullYear(),
});
const [generatedNumber, setGeneratedNumber] = useState('');
const [testResult, setTestResult] = useState<{ number: string; isDefault?: boolean } | null>(null);
const [loading, setLoading] = useState(false);
// Master Data Hooks
@@ -66,18 +67,28 @@ export function TemplateTester({ open, onOpenChange, template }: TemplateTesterP
const handleGenerate = async () => {
if (!template) return;
setLoading(true);
setTestResult(null);
try {
const result = await numberingApi.previewNumber({
const payload = {
projectId: projectId,
originatorOrganizationId: testData.originatorId || "0",
recipientOrganizationId: testData.recipientId || "0",
correspondenceTypeId: parseInt(testData.correspondenceTypeId || "0"),
disciplineId: parseInt(testData.disciplineId || "0"),
year: testData.year
};
console.log("TemplateTester: Sending payload:", payload);
const result = await numberingApi.previewNumber(payload);
console.log("TemplateTester: Received result:", result);
setTestResult({
number: result.previewNumber,
isDefault: result.isDefault
});
setGeneratedNumber(result.previewNumber);
} catch (error: unknown) {
const err = error as { response?: { data?: { message?: string } }; message?: string };
setGeneratedNumber(`Error: ${err.response?.data?.message || err.message || "Unknown error"}`);
} catch (error: any) {
console.error("Test Preview Error:", error);
const errMsg = error?.response?.data?.message || error?.message || "Unknown error";
setTestResult({ number: `Error: ${errMsg}`, isDefault: false });
} finally {
setLoading(false);
}
@@ -196,12 +207,24 @@ export function TemplateTester({ open, onOpenChange, template }: TemplateTesterP
Generate Test Number
</Button>
{generatedNumber && (
<Card className={`p-4 mt-4 border text-center ${generatedNumber.startsWith('Error:') ? 'bg-red-50 border-red-200 text-red-700' : 'bg-green-50 dark:bg-green-950/30 border-green-200 dark:border-green-900'}`}>
<p className="text-sm text-muted-foreground mb-1">{generatedNumber.startsWith('Error:') ? 'Generation Failed:' : 'Generated Number:'}</p>
<p className={`text-2xl font-mono font-bold ${generatedNumber.startsWith('Error:') ? 'text-red-700' : 'text-green-700 dark:text-green-400'}`}>
{generatedNumber}
</p>
{testResult && (
<Card className={`p-4 mt-4 border text-center ${(testResult.number || '').startsWith('Error:') ? 'bg-red-50 border-red-200 text-red-700' : 'bg-green-50 dark:bg-green-950/30 border-green-200 dark:border-green-900'}`}>
<div className="flex justify-between items-center mb-1">
<p className="text-sm text-muted-foreground">{(testResult.number || '').startsWith('Error:') ? 'Generation Failed:' : 'Generated Number:'}</p>
{testResult.isDefault && !(testResult.number || '').startsWith('Error:') && (
<Badge variant="secondary" className="text-[10px] h-4 px-1">Default Template</Badge>
)}
{!testResult.isDefault && !(testResult.number || '').startsWith('Error:') && (
<Badge variant="outline" className="text-[10px] h-4 px-1 border-green-300 text-green-700 bg-green-50">Specific Template</Badge>
)}
</div>
<div className={`text-2xl font-mono font-bold ${(testResult.number || '').startsWith('Error:') ? 'text-red-700' : 'text-green-700 dark:text-green-400'}`}>
{testResult.number || (
<div className="text-xs font-mono text-left bg-slate-100 p-2 overflow-auto max-h-48 border rounded text-foreground">
Empty Result. Raw: {JSON.stringify(testResult, null, 2)}
</div>
)}
</div>
</Card>
)}