made a reusable component for table in routine and nursing care procedures #8608
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| import React from "react"; | ||
| import { formatDate, formatTime } from "../../../Utils/utils"; | ||
| import { classNames } from "../../../Utils/utils"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| interface SharedSectionTableProps { | ||
| data: Record<string, any>; | ||
| rows: Array<{ title?: string; field?: string; subField?: boolean }>; | ||
| choices?: Record<string, Record<number | string, string>>; | ||
| } | ||
|
|
||
| const LogUpdateAnalayseTable: React.FC<SharedSectionTableProps> = ({ | ||
| data, | ||
| rows, | ||
| choices = {}, | ||
| }) => { | ||
| const { t } = useTranslation(); | ||
|
|
||
| // Helper function to get the display value | ||
| const getDisplayValue = ( | ||
| value: string | boolean | null | undefined, | ||
| field?: string, | ||
| ): string => { | ||
| if (value == null) { | ||
| return " "; | ||
| } | ||
|
|
||
| if (typeof value === "boolean") { | ||
| return t(value ? "yes" : "no"); | ||
| } | ||
| if (field && choices[field]) { | ||
| const choice = | ||
| choices[field][value as keyof (typeof choices)[typeof field]]; | ||
| return choice ? t(`${field.toUpperCase()}__${choice}`) : "-"; | ||
| } | ||
| if (value && typeof value == "string") return value; | ||
|
|
||
| return "-"; | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="m-2 w-full overflow-hidden overflow-x-auto rounded-lg border border-black shadow md:w-fit"> | ||
| <table className="border-collapse rounded-lg border bg-secondary-100"> | ||
| <thead className="sticky top-0 bg-white shadow"> | ||
| <tr> | ||
| <th className="sticky left-0 border-b-2 border-r-2 border-black bg-white"></th> | ||
| {Object.keys(data).map((date) => ( | ||
| <> | ||
| <th | ||
| key={date} | ||
| className="w-40 border border-b-2 border-secondary-500 border-b-black p-1 text-sm font-semibold" | ||
| > | ||
| <p>{formatDate(date)}</p> | ||
| <p>{formatTime(date)}</p> | ||
| </th> | ||
| </> | ||
| ))} | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Add key prop to Fragment and improve accessibility.
{Object.keys(data).map((date) => (
- <>
+ <React.Fragment key={date}>
<th
- key={date}
className="w-40 border border-b-2 border-secondary-500 border-b-black p-1 text-sm font-semibold"
>
<p>{formatDate(date)}</p>
<p>{formatTime(date)}</p>
</th>
- </>
+ </React.Fragment>
))}Also, add an aria-label to the table: -<table className="border-collapse rounded-lg border bg-secondary-100">
+<table
+ className="border-collapse rounded-lg border bg-secondary-100"
+ aria-label={t('nursing_care_table_label')}
+>
|
||
| </tr> | ||
| </thead> | ||
| <tbody className="bg-secondary-200"> | ||
| {rows.map((row) => ( | ||
| <tr | ||
| key={row.field ?? row.title} | ||
| className={classNames( | ||
| row.title && "border-t-2 border-t-secondary-600", | ||
| )} | ||
| > | ||
| <th | ||
| className={classNames( | ||
| "sticky left-0 border border-r-2 border-secondary-500 border-r-black bg-white p-2", | ||
| row.subField ? "pl-4 font-medium" : "font-bold", | ||
| )} | ||
| > | ||
| {row.title ?? t(`LOG_UPDATE_FIELD_LABEL__${row.field!}`)} | ||
| </th> | ||
| {Object.values(data).map((obj, idx) => { | ||
| const value = obj[row.field!]; | ||
| return ( | ||
| <td | ||
| key={`${row.field}-${idx}`} | ||
| className="w-80 border border-l-2 border-secondary-500 bg-secondary-100 p-2 text-center font-medium" | ||
| > | ||
| {getDisplayValue(value, row.field)} | ||
| </td> | ||
| ); | ||
| })} | ||
| </tr> | ||
| ))} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default LogUpdateAnalayseTable; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add error handling for failed API requests
Currently, there is no error handling if the API request fails. Consider adding error handling to improve user feedback.
Apply this diff:
🧰 Tools
🪛 Biome
[error] 110-110: Change to an optional chain.
Unsafe fix: Change to an optional chain.
(lint/complexity/useOptionalChain)