Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Death report is missing patient age #8702

Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ab30fd7
Death report is missing patient age
HitishRaoP Oct 4, 2024
cb865a8
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 4, 2024
2773f2b
Added ternary type checking for the age form field
HitishRaoP Oct 4, 2024
f82f703
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 4, 2024
8847c6a
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
nihal467 Oct 4, 2024
e0c52a2
Death report is missing patient age
HitishRaoP Oct 5, 2024
aa0664c
Merge branch 'develop' of https://github.com/HitishRaoP/care_fe into …
HitishRaoP Oct 5, 2024
b56cae6
Merge branch 'issues/8160/Death-report-is-missing-patient-age' of htt…
HitishRaoP Oct 5, 2024
efe86e6
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 8, 2024
a33d25a
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 9, 2024
493c918
removed eslint disable no unsued var in death report
khavinshankar Oct 9, 2024
1f150ba
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 9, 2024
dc1301e
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 10, 2024
35feb4e
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 10, 2024
b70f462
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 11, 2024
daeef76
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 12, 2024
68399f9
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
HitishRaoP Oct 13, 2024
67ed923
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
rithviknishad Oct 15, 2024
df5af4e
Merge branch 'develop' into issues/8160/Death-report-is-missing-patie…
khavinshankar Oct 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/Components/DeathReport/DeathReport.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { useEffect, useState } from "react";
import { statusType, useAbortableEffect } from "../../Common/utils";
import { useState } from "react";
import { GENDER_TYPES } from "../../Common/constants";
import TextFormField from "../Form/FormFields/TextFormField";
import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
import DateFormField from "../Form/FormFields/DateFormField";
import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
import {
formatDateTime,
formatPatientAge,
humanizeStrings,
patientAgeInYears,
} from "../../Utils/utils";
import Page from "../Common/components/Page";
import Form from "../Form/Form";
Expand Down Expand Up @@ -111,7 +109,7 @@ export default function PrintDeathReport(props: { id: string }) {
const patientComorbidities = getPatientComorbidities(res.data);
const data = {
...res.data,
age: patientAgeInYears(res.data!),
age: formatPatientAge(res.data!, true),
gender: patientGender,
address: patientAddress,
comorbidities: patientComorbidities,
Expand Down Expand Up @@ -372,7 +370,7 @@ export default function PrintDeathReport(props: { id: string }) {
<div>
<TextFormField
{...field("age")}
type="number"
type="text"
label={t("age")}
/>
</div>
Expand Down
Loading