diff --git a/tnsw/cda/1-export-coconut-certificate-registration/1-application/previous_feedback_jsonform.json b/tnsw/cda/1-export-coconut-certificate-registration/1-application/previous_feedback_jsonform.json new file mode 100644 index 0000000..b6d14e8 --- /dev/null +++ b/tnsw/cda/1-export-coconut-certificate-registration/1-application/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "cda-apply-coconut-cert--previous-feedback", + "template": "{{if .}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the CDA officer.\n\n> **Officer Comments**: {{.}}\n{{end}}" +} diff --git a/tnsw/cda/1-export-coconut-certificate-registration/1-application/render.json b/tnsw/cda/1-export-coconut-certificate-registration/1-application/render.json index 5269f0a..bf84be8 100644 --- a/tnsw/cda/1-export-coconut-certificate-registration/1-application/render.json +++ b/tnsw/cda/1-export-coconut-certificate-registration/1-application/render.json @@ -18,7 +18,6 @@ "templateId": "cda-apply-coconut-cert--submitted-message", "title": "Submission Status", "projector": "MARKDOWN", - "dataKey": "userform", "visibleWhen": { "states": [ "QUEUED_EXTERNALLY" @@ -31,6 +30,21 @@ "projector": "MARKDOWN", "dataKey": "rejection_reason", "visibleWhen": { + "states": [ + "PENDING_USER" + ], + "requireDataKey": "rejection_reason" + } + }, + "review_history": { + "templateId": "cda-apply-coconut-cert--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "dataKey": "rejection_reason", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], "requireDataKey": "rejection_reason" } }, diff --git a/tnsw/cda/1-export-coconut-certificate-registration/1-application/submitted_message_jsonform.json b/tnsw/cda/1-export-coconut-certificate-registration/1-application/submitted_message_jsonform.json index cf14267..4e603d2 100644 --- a/tnsw/cda/1-export-coconut-certificate-registration/1-application/submitted_message_jsonform.json +++ b/tnsw/cda/1-export-coconut-certificate-registration/1-application/submitted_message_jsonform.json @@ -1,4 +1,4 @@ { "id": "cda-apply-coconut-cert--submitted-message", - "template": "### Application Submitted Successfully\n\nYour CDA Export Coconut Certificate Application has been submitted. The application is now undergoing review/verification by a CDA Quality Assurance Officer.\n\n* **CUSDEC Reference**: `{{.cusdec_number}}`\n* **Status**: Awaiting Officer Verification" + "template": "{{if .verificationform}}\n### ✅ Application Resubmitted\n\nYour corrected CDA Export Coconut Certificate Application has been resubmitted for review. A CDA Quality Assurance Officer will verify the updated details.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Verification\n{{else}}\n### Application Submitted Successfully\n\nYour CDA Export Coconut Certificate Application has been submitted. The application is now undergoing review/verification by a CDA Quality Assurance Officer.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Verification\n{{end}}" } diff --git a/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/previous_feedback_jsonform.json b/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/previous_feedback_jsonform.json new file mode 100644 index 0000000..d6cdb9a --- /dev/null +++ b/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "cda-kcfn-apply--previous-feedback", + "template": "{{if .}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the CDA inspection officer.\n\n> **Officer Comments**: {{.}}\n{{end}}" +} diff --git a/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/render.json b/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/render.json index 44655d7..87581d9 100644 --- a/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/render.json +++ b/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/render.json @@ -18,7 +18,6 @@ "templateId": "cda-kcfn-apply--submitted-message", "title": "Submission Status", "projector": "MARKDOWN", - "dataKey": "userform", "visibleWhen": { "states": [ "QUEUED_EXTERNALLY" @@ -31,6 +30,21 @@ "projector": "MARKDOWN", "dataKey": "reviewerform.rejection_reason", "visibleWhen": { + "states": [ + "PENDING_USER" + ], + "requireDataKey": "reviewerform.rejection_reason" + } + }, + "review_history": { + "templateId": "cda-kcfn-apply--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "dataKey": "reviewerform.rejection_reason", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], "requireDataKey": "reviewerform.rejection_reason" } }, diff --git a/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/submitted_message_jsonform.json b/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/submitted_message_jsonform.json index 058082a..edd84e7 100644 --- a/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/submitted_message_jsonform.json +++ b/tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/submitted_message_jsonform.json @@ -1,4 +1,4 @@ { "id": "cda-kcfn-apply--submitted-message", - "template": "### Application Submitted\n\nYour King Coconut / Fresh Nuts export recommendation application has been submitted and is awaiting container inspection.\n\n* **Commercial Invoice No.**: `{{.commercial_invoice_no}}`\n* **Status**: Awaiting Inspection" + "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected King Coconut / Fresh Nuts export recommendation application has been resubmitted and is awaiting container inspection.\n\n* **Commercial Invoice No.**: `{{.userform.commercial_invoice_no}}`\n* **Status**: Awaiting Inspection\n{{else}}\n### Application Submitted\n\nYour King Coconut / Fresh Nuts export recommendation application has been submitted and is awaiting container inspection.\n\n* **Commercial Invoice No.**: `{{.userform.commercial_invoice_no}}`\n* **Status**: Awaiting Inspection\n{{end}}" } diff --git a/tnsw/cda/3-kernel-products-asycuda-approval/1-application/previous_feedback_jsonform.json b/tnsw/cda/3-kernel-products-asycuda-approval/1-application/previous_feedback_jsonform.json new file mode 100644 index 0000000..b91884f --- /dev/null +++ b/tnsw/cda/3-kernel-products-asycuda-approval/1-application/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "cda-kernel-asycuda--previous-feedback", + "template": "{{if .}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the CDA officer.\n\n> **Officer Comments**: {{.}}\n{{end}}" +} diff --git a/tnsw/cda/3-kernel-products-asycuda-approval/1-application/render.json b/tnsw/cda/3-kernel-products-asycuda-approval/1-application/render.json index 6e0fcdb..60b1e75 100644 --- a/tnsw/cda/3-kernel-products-asycuda-approval/1-application/render.json +++ b/tnsw/cda/3-kernel-products-asycuda-approval/1-application/render.json @@ -18,7 +18,6 @@ "templateId": "cda-kernel-asycuda--submitted-message", "title": "Submission Status", "projector": "MARKDOWN", - "dataKey": "userform", "visibleWhen": { "states": [ "QUEUED_EXTERNALLY" @@ -31,6 +30,21 @@ "projector": "MARKDOWN", "dataKey": "rejection_reason", "visibleWhen": { + "states": [ + "PENDING_USER" + ], + "requireDataKey": "rejection_reason" + } + }, + "review_history": { + "templateId": "cda-kernel-asycuda--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "dataKey": "rejection_reason", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], "requireDataKey": "rejection_reason" } }, diff --git a/tnsw/cda/3-kernel-products-asycuda-approval/1-application/submitted_message_jsonform.json b/tnsw/cda/3-kernel-products-asycuda-approval/1-application/submitted_message_jsonform.json index f7049c6..01ca89b 100644 --- a/tnsw/cda/3-kernel-products-asycuda-approval/1-application/submitted_message_jsonform.json +++ b/tnsw/cda/3-kernel-products-asycuda-approval/1-application/submitted_message_jsonform.json @@ -1,4 +1,4 @@ { "id": "cda-kernel-asycuda--submitted-message", - "template": "### Application Submitted Successfully\n\nYour CDA ASYCUDA Approval Application for Kernel Products has been submitted. The application is now undergoing review by a CDA Officer.\n\n* **CUSDEC Reference**: `{{.cusdec_number}}`\n* **Status**: Awaiting Officer Review" + "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected CDA ASYCUDA Approval Application for Kernel Products has been resubmitted for review. A CDA Officer will review the updated details.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Review\n{{else}}\n### Application Submitted Successfully\n\nYour CDA ASYCUDA Approval Application for Kernel Products has been submitted. The application is now undergoing review by a CDA Officer.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Review\n{{end}}" } diff --git a/tnsw/customs/1-cusdec_submission/previous_feedback_jsonform.json b/tnsw/customs/1-cusdec_submission/previous_feedback_jsonform.json new file mode 100644 index 0000000..08171bb --- /dev/null +++ b/tnsw/customs/1-cusdec_submission/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "customs-cusdec--previous-feedback", + "template": "{{if .reviewerform.rejection_reason}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with Sri Lanka Customs.\n\n> **Officer Comments**: {{.reviewerform.rejection_reason}}\n{{end}}" +} diff --git a/tnsw/customs/1-cusdec_submission/render.json b/tnsw/customs/1-cusdec_submission/render.json index aa33a76..1a052f0 100644 --- a/tnsw/customs/1-cusdec_submission/render.json +++ b/tnsw/customs/1-cusdec_submission/render.json @@ -21,6 +21,10 @@ "projector": "MARKDOWN", "dataKey": "reviewerform", "visibleWhen": { + "states": [ + "PENDING_USER", + "COMPLETED" + ], "requireDataKey": "reviewerform" } }, @@ -28,13 +32,23 @@ "templateId": "customs-cusdec--submitted-message", "title": "Submission Status", "projector": "MARKDOWN", - "dataKey": "userform", "visibleWhen": { "states": [ "QUEUED_EXTERNALLY" ] } }, + "review_history": { + "templateId": "customs-cusdec--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], + "requireDataKey": "reviewerform" + } + }, "user_form": { "templateId": "customs-cusdec--user-form", "title": "CusDec Application Details", diff --git a/tnsw/customs/1-cusdec_submission/submitted_message_jsonform.json b/tnsw/customs/1-cusdec_submission/submitted_message_jsonform.json index bb58788..7600fea 100644 --- a/tnsw/customs/1-cusdec_submission/submitted_message_jsonform.json +++ b/tnsw/customs/1-cusdec_submission/submitted_message_jsonform.json @@ -1,4 +1,4 @@ { "id": "customs-cusdec--submitted-message", - "template": "### Customs Declaration (CusDec) Submitted Successfully\n\nYour Customs Declaration (CusDec) has been submitted. Customs officers will review the declaration and attached SAD documents.\n\nYou will be notified once the assessment is complete." + "template": "{{if .reviewerform}}\n### ✅ CusDec Resubmitted\n\nYour corrected Customs Declaration (CusDec) has been resubmitted for review. Customs officers will assess the updated declaration and attached SAD documents.\n\n* **Status**: Awaiting Officer Review\n{{else}}\n### Customs Declaration (CusDec) Submitted Successfully\n\nYour Customs Declaration (CusDec) has been submitted. Customs officers will review the declaration and attached SAD documents.\n\nYou will be notified once the assessment is complete.\n{{end}}" } diff --git a/tnsw/fcau/1-application/previous_feedback_jsonform.json b/tnsw/fcau/1-application/previous_feedback_jsonform.json new file mode 100644 index 0000000..7803f80 --- /dev/null +++ b/tnsw/fcau/1-application/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "fcau-apply-health-cert--previous-feedback", + "template": "{{if .reviewerform.rejection_reason}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the FCAU officer.\n\n> **Officer Comments**: {{.reviewerform.rejection_reason}}\n{{end}}" +} diff --git a/tnsw/fcau/1-application/render.json b/tnsw/fcau/1-application/render.json index af80184..fe2cae3 100644 --- a/tnsw/fcau/1-application/render.json +++ b/tnsw/fcau/1-application/render.json @@ -9,6 +9,10 @@ "projector": "MARKDOWN", "dataKey": "reviewerform", "visibleWhen": { + "states": [ + "PENDING_USER", + "COMPLETED" + ], "requireDataKey": "reviewerform" } }, @@ -16,13 +20,23 @@ "templateId": "fcau-apply-health-cert--submitted-message", "title": "Submission Status", "projector": "MARKDOWN", - "dataKey": "userform", "visibleWhen": { "states": [ "QUEUED_EXTERNALLY" ] } }, + "review_history": { + "templateId": "fcau-apply-health-cert--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], + "requireDataKey": "reviewerform" + } + }, "user_form": { "templateId": "fcau-apply-health-cert--user-form", "title": "Health Certificate Application", diff --git a/tnsw/fcau/1-application/reviewerinput.json b/tnsw/fcau/1-application/reviewerinput.json index a5f98dc..7f2c7ae 100644 --- a/tnsw/fcau/1-application/reviewerinput.json +++ b/tnsw/fcau/1-application/reviewerinput.json @@ -12,7 +12,7 @@ "id": "authz", "phase": "PRE_RESUME", "properties": { - "QUEUED_EXTERNALLY": { "approve": ["fcau"], "reject": ["fcau"] } + "QUEUED_EXTERNALLY": { "approve": ["fcau"], "reject": ["fcau"], "needs_more_info": ["fcau"] } } } ] diff --git a/tnsw/fcau/1-application/submitted_message_jsonform.json b/tnsw/fcau/1-application/submitted_message_jsonform.json index b728c5f..5eb445e 100644 --- a/tnsw/fcau/1-application/submitted_message_jsonform.json +++ b/tnsw/fcau/1-application/submitted_message_jsonform.json @@ -1,4 +1,4 @@ { "id": "fcau-apply-health-cert--submitted-message", - "template": "### Application Under Review\n\nYour FCAU Health Certificate Application has been submitted successfully and is currently being reviewed by FCAU officers. Please wait for an update.\n\n* **Status**: Awaiting Officer Review" + "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected FCAU Health Certificate Application has been resubmitted for review. An FCAU officer will review the updated details.\n\n* **Status**: Awaiting Officer Review\n{{else}}\n### Application Under Review\n\nYour FCAU Health Certificate Application has been submitted successfully and is currently being reviewed by FCAU officers. Please wait for an update.\n\n* **Status**: Awaiting Officer Review\n{{end}}" } diff --git a/tnsw/fcau/3-3-payment_post_wh_lab_fee/previous_feedback_jsonform.json b/tnsw/fcau/3-3-payment_post_wh_lab_fee/previous_feedback_jsonform.json new file mode 100644 index 0000000..fcb7dab --- /dev/null +++ b/tnsw/fcau/3-3-payment_post_wh_lab_fee/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "fcau-pay-post-wh-lab-fee--previous-feedback", + "template": "{{if .paymentreviewerform.payment_feedback}}\n### Review History\n\nComments from the previous review round. Your latest receipt is now with the FCAU officer.\n\n> **Officer Comments**: {{.paymentreviewerform.payment_feedback}}\n{{end}}" +} diff --git a/tnsw/fcau/3-3-payment_post_wh_lab_fee/render.json b/tnsw/fcau/3-3-payment_post_wh_lab_fee/render.json index 93697cb..a8dac79 100644 --- a/tnsw/fcau/3-3-payment_post_wh_lab_fee/render.json +++ b/tnsw/fcau/3-3-payment_post_wh_lab_fee/render.json @@ -39,10 +39,30 @@ "projector": "MARKDOWN", "visibleWhen": { "states": [ - "QUEUED_EXTERNALLY", "COMPLETED" ] } + }, + "status_awaiting": { + "templateId": "fcau-pay-post-wh-lab-fee--status-awaiting", + "title": "Verification Status", + "projector": "MARKDOWN", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ] + } + }, + "review_history": { + "templateId": "fcau-pay-post-wh-lab-fee--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], + "requireDataKey": "paymentreviewerform" + } } }, "states": { diff --git a/tnsw/fcau/3-3-payment_post_wh_lab_fee/status_awaiting_jsonform.json b/tnsw/fcau/3-3-payment_post_wh_lab_fee/status_awaiting_jsonform.json new file mode 100644 index 0000000..bbc6f1d --- /dev/null +++ b/tnsw/fcau/3-3-payment_post_wh_lab_fee/status_awaiting_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "fcau-pay-post-wh-lab-fee--status-awaiting", + "template": "{{if .paymentreviewerform}}\n### ✅ Receipt Resubmitted\n\nYour corrected laboratory fee payment receipt has been resubmitted for review. An FCAU officer will verify the updated proof of payment.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\n* **Status**: Awaiting Officer Verification\n{{else}}\n### Payment Verification Pending\n\nYour laboratory test payment receipt has been submitted and is currently being reviewed by an FCAU officer.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\nThis page will update automatically once the review is completed.\n{{end}}" +} diff --git a/tnsw/fcau/4-3-payment_lab_fee/previous_feedback_jsonform.json b/tnsw/fcau/4-3-payment_lab_fee/previous_feedback_jsonform.json new file mode 100644 index 0000000..58818ad --- /dev/null +++ b/tnsw/fcau/4-3-payment_lab_fee/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "fcau-pay-lab-fee--previous-feedback", + "template": "{{if .paymentreviewerform.payment_feedback}}\n### Review History\n\nComments from the previous review round. Your latest receipt is now with the FCAU officer.\n\n> **Officer Comments**: {{.paymentreviewerform.payment_feedback}}\n{{end}}" +} diff --git a/tnsw/fcau/4-3-payment_lab_fee/render.json b/tnsw/fcau/4-3-payment_lab_fee/render.json index 968f142..891f560 100644 --- a/tnsw/fcau/4-3-payment_lab_fee/render.json +++ b/tnsw/fcau/4-3-payment_lab_fee/render.json @@ -38,10 +38,30 @@ "projector": "MARKDOWN", "visibleWhen": { "states": [ - "QUEUED_EXTERNALLY", "COMPLETED" ] } + }, + "status_awaiting": { + "templateId": "fcau-pay-lab-fee--status-awaiting", + "title": "Verification Status", + "projector": "MARKDOWN", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ] + } + }, + "review_history": { + "templateId": "fcau-pay-lab-fee--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "visibleWhen": { + "states": [ + "QUEUED_EXTERNALLY" + ], + "requireDataKey": "paymentreviewerform" + } } }, "states": { diff --git a/tnsw/fcau/4-3-payment_lab_fee/status_awaiting_jsonform.json b/tnsw/fcau/4-3-payment_lab_fee/status_awaiting_jsonform.json new file mode 100644 index 0000000..49461dd --- /dev/null +++ b/tnsw/fcau/4-3-payment_lab_fee/status_awaiting_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "fcau-pay-lab-fee--status-awaiting", + "template": "{{if .paymentreviewerform}}\n### ✅ Receipt Resubmitted\n\nYour corrected laboratory fee payment receipt has been resubmitted for review. An FCAU officer will verify the updated proof of payment.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\n* **Status**: Awaiting Officer Verification\n{{else}}\n### Payment Verification Pending\n\nYour laboratory test payment receipt has been submitted and is currently being reviewed by an FCAU officer.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\nThis page will update automatically once the review is completed.\n{{end}}" +} diff --git a/tnsw/manifest.json b/tnsw/manifest.json index 7658276..ca63e3b 100644 --- a/tnsw/manifest.json +++ b/tnsw/manifest.json @@ -198,6 +198,18 @@ "version": "1", "path": "npqs/1-apply/commodity_common_names.data.json" }, + { + "id": "npqs-apply-phyto-cert--status-awaiting", + "kind": "generic_template", + "version": "", + "path": "npqs/1-apply/status_awaiting_jsonform.json" + }, + { + "id": "npqs-apply-phyto-cert--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "npqs/1-apply/previous_feedback_jsonform.json" + }, { "id": "npqs-draw-sample--officer-draw", "kind": "subtask_template", @@ -468,6 +480,18 @@ "version": "", "path": "npqs/5-1-treatment_request/status_markdown.json" }, + { + "id": "npqs-treatment-request--status-awaiting", + "kind": "generic_template", + "version": "", + "path": "npqs/5-1-treatment_request/status_awaiting_jsonform.json" + }, + { + "id": "npqs-treatment-request--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "npqs/5-1-treatment_request/previous_feedback_jsonform.json" + }, { "id": "npqs-pay-for-treatment--instructions-wrapper", "kind": "generic_template", @@ -942,6 +966,12 @@ "version": "", "path": "fcau/1-application/submitted_message_jsonform.json" }, + { + "id": "fcau-apply-health-cert--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "fcau/1-application/previous_feedback_jsonform.json" + }, { "id": "fcau-apply-health-cert--user-input", "kind": "subtask_template", @@ -1164,6 +1194,18 @@ "version": "", "path": "fcau/3-3-payment_post_wh_lab_fee/review_status_jsonform.json" }, + { + "id": "fcau-pay-post-wh-lab-fee--status-awaiting", + "kind": "generic_template", + "version": "", + "path": "fcau/3-3-payment_post_wh_lab_fee/status_awaiting_jsonform.json" + }, + { + "id": "fcau-pay-post-wh-lab-fee--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "fcau/3-3-payment_post_wh_lab_fee/previous_feedback_jsonform.json" + }, { "id": "fcau-pay-post-wh-lab-fee-flow:render", "kind": "generic_template", @@ -1338,6 +1380,18 @@ "version": "", "path": "fcau/4-3-payment_lab_fee/review_status_jsonform.json" }, + { + "id": "fcau-pay-lab-fee--status-awaiting", + "kind": "generic_template", + "version": "", + "path": "fcau/4-3-payment_lab_fee/status_awaiting_jsonform.json" + }, + { + "id": "fcau-pay-lab-fee--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "fcau/4-3-payment_lab_fee/previous_feedback_jsonform.json" + }, { "id": "fcau-pay-lab-fee-flow:render", "kind": "generic_template", @@ -1476,6 +1530,12 @@ "version": "", "path": "cda/1-export-coconut-certificate-registration/1-application/feedback_jsonform.json" }, + { + "id": "cda-apply-coconut-cert--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "cda/1-export-coconut-certificate-registration/1-application/previous_feedback_jsonform.json" + }, { "id": "cda-apply-coconut-cert--bag-template", "kind": "generic_template", @@ -1794,6 +1854,12 @@ "version": "", "path": "cda/3-kernel-products-asycuda-approval/1-application/feedback_jsonform.json" }, + { + "id": "cda-kernel-asycuda--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "cda/3-kernel-products-asycuda-approval/1-application/previous_feedback_jsonform.json" + }, { "id": "cda-kernel-asycuda--officer-review", "kind": "subtask_template", @@ -1872,6 +1938,12 @@ "version": "", "path": "cda/2-king-coconut-fresh-nuts-recommendation/1-application/feedback_jsonform.json" }, + { + "id": "cda-kcfn-apply--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "cda/2-king-coconut-fresh-nuts-recommendation/1-application/previous_feedback_jsonform.json" + }, { "id": "cda-kcfn-apply--submitted-message", "kind": "generic_template", @@ -2076,6 +2148,12 @@ "version": "", "path": "customs/1-cusdec_submission/submitted_message_jsonform.json" }, + { + "id": "customs-cusdec--previous-feedback", + "kind": "generic_template", + "version": "", + "path": "customs/1-cusdec_submission/previous_feedback_jsonform.json" + }, { "id": "customs-cusdec--trader-results", "kind": "generic_template", diff --git a/tnsw/npqs/1-apply/previous_feedback_jsonform.json b/tnsw/npqs/1-apply/previous_feedback_jsonform.json new file mode 100644 index 0000000..f94b698 --- /dev/null +++ b/tnsw/npqs/1-apply/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "npqs-apply-phyto-cert--previous-feedback", + "template": "{{if .reviewerform.clarification_reason}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the PQS/NPQS officer.\n\n> **Officer Comments**: {{.reviewerform.clarification_reason}}\n{{end}}" +} diff --git a/tnsw/npqs/1-apply/render.json b/tnsw/npqs/1-apply/render.json index fe0c29b..4967cbc 100644 --- a/tnsw/npqs/1-apply/render.json +++ b/tnsw/npqs/1-apply/render.json @@ -9,18 +9,27 @@ "projector": "MARKDOWN", "dataKey": "reviewerform", "visibleWhen": { + "states": ["PENDING_USER", "COMPLETED"], "requireDataKey": "reviewerform" } }, - "status_message": { - "templateId": "npqs-apply-phyto-cert--status", + "status_awaiting": { + "templateId": "npqs-apply-phyto-cert--status-awaiting", "title": "Application Status", "projector": "MARKDOWN", - "dataKey": "userform", "visibleWhen": { "states": ["QUEUED_EXTERNALLY"] } }, + "review_history": { + "templateId": "npqs-apply-phyto-cert--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "visibleWhen": { + "states": ["QUEUED_EXTERNALLY"], + "requireDataKey": "reviewerform" + } + }, "submission_form": { "templateId": "npqs-apply-phyto-cert--user-form", "title": "Phytosanitary Certificate Application", diff --git a/tnsw/npqs/1-apply/status_awaiting_jsonform.json b/tnsw/npqs/1-apply/status_awaiting_jsonform.json new file mode 100644 index 0000000..729afa5 --- /dev/null +++ b/tnsw/npqs/1-apply/status_awaiting_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "npqs-apply-phyto-cert--status-awaiting", + "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected phytosanitary certificate application has been resubmitted for review. The assigned PQS/NPQS officer will review the updated details.\n\n* **Applicant Name**: {{.userform.applicant_name}}\n* **Importing Country**: {{.userform.importing_country.label}}\n* **Status**: Awaiting Officer Review\n{{else}}\n### ⏳ Application Under Review\n\nYour phytosanitary certificate application has been submitted and is awaiting review by the assigned PQS/NPQS officer at **{{.userform.nppo_office_location}}**.\n\n* **Applicant Name**: {{.userform.applicant_name}}\n* **Importing Country**: {{.userform.importing_country.label}}\n* **Exporter**: {{.userform.exporter_name}}\n\nYou will be notified once the review is completed. No action is required from you at this stage.\n{{end}}" +} diff --git a/tnsw/npqs/5-1-treatment_request/previous_feedback_jsonform.json b/tnsw/npqs/5-1-treatment_request/previous_feedback_jsonform.json new file mode 100644 index 0000000..902ce4a --- /dev/null +++ b/tnsw/npqs/5-1-treatment_request/previous_feedback_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "npqs-treatment-request--previous-feedback", + "template": "{{if .reviewerform.clarification_comments}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the NPQS officer.\n\n> **Officer Comments**: {{.reviewerform.clarification_comments}}\n{{end}}" +} diff --git a/tnsw/npqs/5-1-treatment_request/render.json b/tnsw/npqs/5-1-treatment_request/render.json index ddb781b..2b6f7a4 100644 --- a/tnsw/npqs/5-1-treatment_request/render.json +++ b/tnsw/npqs/5-1-treatment_request/render.json @@ -9,17 +9,27 @@ "projector": "MARKDOWN", "dataKey": "reviewerform", "visibleWhen": { + "states": ["PENDING_USER", "COMPLETED"], "requireDataKey": "reviewerform" } }, - "status_message": { - "templateId": "npqs-treatment-request--status", + "status_awaiting": { + "templateId": "npqs-treatment-request--status-awaiting", "title": "Request Status", "projector": "MARKDOWN", "visibleWhen": { "states": ["QUEUED_EXTERNALLY"] } }, + "review_history": { + "templateId": "npqs-treatment-request--previous-feedback", + "title": "Review History", + "projector": "MARKDOWN", + "visibleWhen": { + "states": ["QUEUED_EXTERNALLY"], + "requireDataKey": "reviewerform" + } + }, "submission_form": { "templateId": "npqs-treatment-request--trader-form", "title": "Treatment Request Details", diff --git a/tnsw/npqs/5-1-treatment_request/status_awaiting_jsonform.json b/tnsw/npqs/5-1-treatment_request/status_awaiting_jsonform.json new file mode 100644 index 0000000..f921d71 --- /dev/null +++ b/tnsw/npqs/5-1-treatment_request/status_awaiting_jsonform.json @@ -0,0 +1,4 @@ +{ + "id": "npqs-treatment-request--status-awaiting", + "template": "{{if .reviewerform}}\n### ✅ Treatment Request Resubmitted\n\nYour corrected treatment request has been resubmitted for review. An NPQS officer will review the updated details.\n\n* **Reference Number**: `{{.reference_number}}`\n* **Status**: Awaiting Officer Review\n{{else}}\n### ⏳ Treatment Request Under Review\n\nYour treatment request has been submitted and is awaiting review by the NPQS officer.\n\n* **Reference Number**: `{{.reference_number}}`\n* **Treatment Type**: {{.traderinput.treatment_type}}\n* **Duration**: {{.traderinput.treatment_duration}}\n\nYou will be notified once the officer has reviewed your request.\n{{end}}" +}