251213:1509 Docunment Number Businee Rule not correct

frontend/components/correspondences/detail.tsx

@@ -28,7 +28,7 @@ export function CorrespondenceDetail({ data }: CorrespondenceDetailProps) {
 
   // Derive Current Revision Data
   const currentRevision = data.revisions?.find(r => r.isCurrent) || data.revisions?.[0];
-  const subject = currentRevision?.title || "-";
+  const subject = currentRevision?.subject || "-";
   const description = currentRevision?.description || "-";
   const status = currentRevision?.status?.statusCode || "UNKNOWN"; // e.g. DRAFT
   const attachments = currentRevision?.attachments || [];
@@ -169,6 +169,24 @@ export function CorrespondenceDetail({ data }: CorrespondenceDetailProps) {
                 </p>
               </div>
 
+              {currentRevision?.body && (
+                <div>
+                  <h3 className="font-semibold mb-2">Content</h3>
+                  <div className="text-gray-700 whitespace-pre-wrap p-3 bg-muted/10 rounded-md border">
+                    {currentRevision.body}
+                  </div>
+                </div>
+              )}
+
+              {currentRevision?.remarks && (
+                <div>
+                  <h3 className="font-semibold mb-2">Remarks</h3>
+                  <p className="text-gray-600 italic">
+                    {currentRevision.remarks}
+                  </p>
+                </div>
+              )}
+
               <hr className="my-4 border-t" />
 
               <div>
@@ -223,8 +241,8 @@ export function CorrespondenceDetail({ data }: CorrespondenceDetailProps) {
 
               <div>
                 <p className="text-sm font-medium text-muted-foreground">Originator</p>
-                <p className="font-medium mt-1">{data.originator?.orgName || '-'}</p>
-                <p className="text-xs text-muted-foreground">{data.originator?.orgCode || '-'}</p>
+                <p className="font-medium mt-1">{data.originator?.organizationName || '-'}</p>
+                <p className="text-xs text-muted-foreground">{data.originator?.organizationCode || '-'}</p>
               </div>
 
                <div>

frontend/components/correspondences/form.tsx

@@ -21,6 +21,8 @@ import { useCreateCorrespondence, useUpdateCorrespondence } from "@/hooks/use-co
 import { Organization } from "@/types/organization";
 import { useOrganizations, useProjects, useCorrespondenceTypes, useDisciplines } from "@/hooks/use-master-data";
 import { CreateCorrespondenceDto } from "@/types/dto/correspondence/create-correspondence.dto";
+import { useState, useEffect } from "react";
+import { correspondenceService } from "@/lib/services/correspondence.service";
 
 // Updated Zod Schema with all required fields
 const correspondenceSchema = z.object({
@@ -29,6 +31,9 @@ const correspondenceSchema = z.object({
   disciplineId: z.number().optional(),
   subject: z.string().min(5, "Subject must be at least 5 characters"),
   description: z.string().optional(),
+  body: z.string().optional(),
+  remarks: z.string().optional(),
+  dueDate: z.string().optional(), // ISO Date string
   fromOrganizationId: z.number().min(1, "Please select From Organization"),
   toOrganizationId: z.number().min(1, "Please select To Organization"),
   importance: z.enum(["NORMAL", "HIGH", "URGENT"]),
@@ -54,10 +59,14 @@ export function CorrespondenceForm({ initialData, id }: { initialData?: any, id?
     projectId: initialData?.projectId || undefined,
     documentTypeId: initialData?.correspondenceTypeId || undefined,
     disciplineId: initialData?.disciplineId || undefined,
-    subject: currentRev?.title || "",
+    subject: currentRev?.subject || currentRev?.title || "",
     description: currentRev?.description || "",
+    body: currentRev?.body || "",
+    remarks: currentRev?.remarks || "",
+    dueDate: currentRev?.dueDate ? new Date(currentRev.dueDate).toISOString().split('T')[0] : undefined,
     fromOrganizationId: initialData?.originatorId || undefined,
-    toOrganizationId: currentRev?.details?.to_organization_id || undefined,
+    // Map initial recipient (TO) - Simplified for now
+    toOrganizationId: initialData?.recipients?.find((r: any) => r.recipientType === 'TO')?.recipientOrganizationId || undefined,
     importance: currentRev?.details?.importance || "NORMAL",
   };
 
@@ -84,11 +93,16 @@ export function CorrespondenceForm({ initialData, id }: { initialData?: any, id?
       projectId: data.projectId,
       typeId: data.documentTypeId,
       disciplineId: data.disciplineId,
-      title: data.subject,
+      subject: data.subject,
       description: data.description,
+      body: data.body,
+      remarks: data.remarks,
+      dueDate: data.dueDate ? new Date(data.dueDate).toISOString() : undefined,
       originatorId: data.fromOrganizationId,
+      recipients: [
+        { organizationId: data.toOrganizationId, type: 'TO' }
+      ],
       details: {
-        to_organization_id: data.toOrganizationId,
         importance: data.importance
       },
     };
@@ -108,8 +122,56 @@ export function CorrespondenceForm({ initialData, id }: { initialData?: any, id?
 
   const isPending = createMutation.isPending || updateMutation.isPending;
 
+  // -- Preview Logic --
+  const [preview, setPreview] = useState<{ number: string; isDefaultTemplate: boolean } | null>(null);
+
+  useEffect(() => {
+    if (!projectId || !documentTypeId || !fromOrgId || !toOrgId) {
+       setPreview(null);
+       return;
+    }
+
+    const fetchPreview = async () => {
+       try {
+         const res = await correspondenceService.previewNumber({
+             projectId,
+             typeId: documentTypeId,
+             disciplineId,
+             originatorId: fromOrgId,
+             // Map recipients structure matching backend expectation
+             recipients: [{ organizationId: toOrgId, type: 'TO' }],
+             // Add date just to be safe, though service uses 'now'
+             dueDate: new Date().toISOString()
+         });
+         setPreview(res);
+       } catch (err) {
+         setPreview(null);
+       }
+    };
+
+    const timer = setTimeout(fetchPreview, 500);
+    return () => clearTimeout(timer);
+  }, [projectId, documentTypeId, disciplineId, fromOrgId, toOrgId]);
+
+
+
   return (
     <form onSubmit={handleSubmit(onSubmit)} className="max-w-3xl space-y-6">
+      {/* Preview Section */}
+      {preview && (
+        <div className="p-4 rounded-md bg-muted border border-border">
+           <p className="text-sm text-muted-foreground mb-1">Document Number Preview</p>
+           <div className="flex items-center gap-3">
+             <span className="text-xl font-bold font-mono text-primary tracking-wide">{preview.number}</span>
+             {preview.isDefaultTemplate && (
+                <span className="text-[10px] uppercase font-semibold px-2 py-0.5 rounded-full bg-yellow-100 text-yellow-800 border border-yellow-200">
+                   Default Template
+                </span>
+             )}
+           </div>
+        </div>
+      )}
+
       {/* Document Metadata Section */}
       <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
         {/* Project Dropdown */}
@@ -191,14 +253,37 @@ export function CorrespondenceForm({ initialData, id }: { initialData?: any, id?
         )}
       </div>
 
+       {/* Body */}
+       <div className="space-y-2">
+        <Label htmlFor="body">Body (Content)</Label>
+        <Textarea
+          id="body"
+          {...register("body")}
+          rows={6}
+          placeholder="Enter letter content..."
+        />
+      </div>
+
+      {/* Remarks & Due Date */}
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div className="space-y-2">
+            <Label htmlFor="remarks">Remarks</Label>
+            <Input id="remarks" {...register("remarks")} placeholder="Optional remarks" />
+          </div>
+          <div className="space-y-2">
+            <Label htmlFor="dueDate">Due Date</Label>
+            <Input id="dueDate" type="date" {...register("dueDate")} />
+          </div>
+      </div>
+
       {/* Description */}
       <div className="space-y-2">
-        <Label htmlFor="description">Description</Label>
+        <Label htmlFor="description">Description (Internal Note)</Label>
         <Textarea
           id="description"
           {...register("description")}
-          rows={4}
-          placeholder="Enter description details..."
+          rows={2}
+          placeholder="Enter description..."
         />
       </div>
 

frontend/components/correspondences/list.tsx

@@ -30,11 +30,11 @@ export function CorrespondenceList({ data }: CorrespondenceListProps) {
       ),
     },
     {
-      accessorKey: "title",
+      accessorKey: "subject",
       header: "Subject",
       cell: ({ row }) => (
-        <div className="max-w-[300px] truncate" title={row.original.title}>
-          {row.original.title}
+        <div className="max-w-[300px] truncate" title={row.original.subject}>
+          {row.original.subject}
         </div>
       ),
     },