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.

Sign up for GitHub

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

Jump to bottom

Issues/8607/review missed #9259

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Issues/8607/review missed #9259

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb3f18d
Adds support for review missed logic #8607
Sancharisingh Nov 30, 2024
b47daad
Merge branch 'ohcnetwork:develop' into issues/8607/review-missed
Sancharisingh Nov 30, 2024
4972598
Merge branch 'ohcnetwork:develop' into issues/8607/review-missed
Sancharisingh Dec 3, 2024
7d0a6c2
Update package.json
Sancharisingh Dec 3, 2024
7bc58ae
Update ManagePatients.tsx
Sancharisingh Dec 3, 2024
b0d6b44
Update package-lock.json
Sancharisingh Dec 3, 2024
47b4c4a
Update package.json
Sancharisingh Dec 3, 2024
3e10890
Update package.json
Sancharisingh Dec 3, 2024
fb0039d
Update package-lock.json
Sancharisingh Dec 3, 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
164 changes: 63 additions & 101 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7",
"use-keyboard-shortcut": "^1.1.6",
"xlsx": "^0.18.5"
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
Sancharisingh marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Sancharisingh this change seems to be unrelated to the linked PR. If you meant to solve #9183, please raise a separate PR solving that alone.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rithviknishad, I’ve removed the changes related to SheetJS. Please review now and let me know if further adjustments are needed.

},
"devDependencies": {
"@julr/vite-plugin-validate-env": "^1.1.1",
Expand Down
21 changes: 20 additions & 1 deletion src/components/Patient/ManagePatients.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ export const PatientManager = () => {
)}
</>
)}
{patient.review_time &&
{/* {patient.review_time &&
!patient.last_consultation?.discharge_date &&
Number(patient.last_consultation?.review_interval) > 0 &&
dayjs().isAfter(patient.review_time) && (
Expand All @@ -638,7 +638,26 @@ export const PatientManager = () => {
startIcon="l-clock"
text="Review Missed"
/>
)} */}
{patient.review_time &&
!patient.last_consultation?.discharge_date &&
Number(patient.last_consultation?.review_interval) > 0 && (
<Chip
size="small"
variant={
dayjs().isAfter(patient.review_time)
? "danger"
: "alert"
}
startIcon="l-clock"
text={
dayjs().isAfter(patient.review_time)
? `Review Missed (${Math.abs(dayjs().diff(dayjs(patient.review_time), "days"))} days ago)`
: `Review Due in (${Math.abs(dayjs(patient.review_time).diff(dayjs(), "days"))} days)`
}
/>
)}

{patient.last_consultation?.is_readmission && (
<Chip
size="small"
Expand Down