fix: add assignment property in declaration

opencrvs · Jan 10, 2025 · c5b0a9f · c5b0a9f
1 parent 449da54
commit c5b0a9f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/packages/client/src/declarations/index.ts b/packages/client/src/declarations/index.ts
@@ -21,6 +21,7 @@ import {
 } from '@client/forms'
 import { SCOPES } from '@opencrvs/commons/client'
 import {
+  AssignmentData,
   Attachment,
   EventType,
   History,
@@ -230,6 +231,7 @@ export interface IDeclaration {
   writingDraft?: boolean
   operationHistories?: ITaskHistory[]
   isNotDuplicate?: boolean
+  assignmentStatus?: AssignmentData
 }
 
 type Relation =
@@ -1531,6 +1533,10 @@ export const declarationsReducer: LoopReducer<IDeclarationsState, Action> = (
       newDeclarationsAfterDownload[downloadingDeclarationIndex].downloadStatus =
         DOWNLOAD_STATUS.DOWNLOADED
 
+      newDeclarationsAfterDownload[
+        downloadingDeclarationIndex
+      ].assignmentStatus = eventData?.registration?.assignment ?? null
+
       const newStateAfterDownload = {
         ...state,
         declarations: newDeclarationsAfterDownload

diff --git a/packages/client/src/views/DataProvider/birth/queries.ts b/packages/client/src/views/DataProvider/birth/queries.ts
@@ -149,6 +149,13 @@ const GET_BIRTH_REGISTRATION_FOR_REVIEW = gql`
         contactRelationship
         contactPhoneNumber
         contactEmail
+        assignment {
+          practitionerId
+          firstName
+          lastName
+          officeName
+          avatarURL
+        }
         certificates {
           hasShowedVerifiedDocument
           certificateTemplateId

diff --git a/packages/client/src/views/DataProvider/death/queries.ts b/packages/client/src/views/DataProvider/death/queries.ts
@@ -535,6 +535,13 @@ export const GET_DEATH_REGISTRATION_FOR_CERTIFICATION = gql`
         contactEmail
         contactPhoneNumber
         informantsSignature
+        assignment {
+          practitionerId
+          firstName
+          lastName
+          officeName
+          avatarURL
+        }
         duplicates {
           compositionId
           trackingId

diff --git a/packages/client/src/views/DataProvider/marriage/queries.ts b/packages/client/src/views/DataProvider/marriage/queries.ts
@@ -502,6 +502,13 @@ const GET_MARRIAGE_REGISTRATION_FOR_CERTIFICATE = gql`
         brideSignature
         witnessOneSignature
         witnessTwoSignature
+        assignment {
+          practitionerId
+          firstName
+          lastName
+          officeName
+          avatarURL
+        }
         duplicates {
           compositionId
           trackingId

diff --git a/packages/client/src/views/RecordAudit/RecordAudit.tsx b/packages/client/src/views/RecordAudit/RecordAudit.tsx
@@ -576,7 +576,7 @@ const BodyContent = ({
         draft.submissionStatus === SUBMISSION_STATUS.DRAFT)
         ? {
             ...getDraftDeclarationData(draft, resources, intl, trackingId),
-            assignment: workqueueDeclaration?.registration?.assignment
+            assignment: draft?.assignmentStatus
           }
         : getWQDeclarationData(
             workqueueDeclaration as NonNullable<typeof workqueueDeclaration>,