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

Respiratory support table/graph: render no data points with no mode/modality #9139

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Respiratory support table/graph: render no data points with no mode/modality #9139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
016e301
Render data points with no mode/modality
Jacobjeevan Nov 15, 2024
f3c2fcd
Merge branch 'develop' into issues/9136-respiratory-table
nihal467 Nov 17, 2024
824ec15
Merge branch 'develop' into issues/9136-respiratory-table
nihal467 Nov 18, 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
60 changes: 22 additions & 38 deletions src/components/Facility/Consultations/VentilatorPlot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,63 +110,47 @@ export const VentilatorPlot = ({
case "ventilator_tidal_volume":
case "ventilator_peep":
condition =
(currentRound.ventilator_interface === "INVASIVE" ||
currentRound.ventilator_interface === "NON_INVASIVE") &&
!!currentRound.ventilator_mode;
currentRound.ventilator_interface === "INVASIVE" ||
currentRound.ventilator_interface === "NON_INVASIVE";
break;
case "ventilator_fio2":
condition =
currentRound.ventilator_interface === "OXYGEN_SUPPORT" &&
currentRound.ventilator_oxygen_modality === "HIGH_FLOW_NASAL_CANNULA";
break;
case "ventilator_spo2":
condition =
currentRound.ventilator_interface === "OXYGEN_SUPPORT" &&
(currentRound.ventilator_oxygen_modality === "NASAL_PRONGS" ||
currentRound.ventilator_oxygen_modality === "SIMPLE_FACE_MASK" ||
currentRound.ventilator_oxygen_modality ===
"NON_REBREATHING_MASK" ||
currentRound.ventilator_interface === "INVASIVE" ||
currentRound.ventilator_interface === "NON_INVASIVE" ||
(currentRound.ventilator_interface === "OXYGEN_SUPPORT" &&
currentRound.ventilator_oxygen_modality ===
"HIGH_FLOW_NASAL_CANNULA");
break;
case "ventilator_spo2":
condition = currentRound.ventilator_interface !== "UNKNOWN";
break;
case "etco2":
case "ventilator_oxygen_modality_flow_rate":
condition =
!!currentRound.ventilator_mode ||
!!currentRound.ventilator_oxygen_modality ||
false;
currentRound.ventilator_interface === "OXYGEN_SUPPORT" &&
currentRound.ventilator_oxygen_modality === "HIGH_FLOW_NASAL_CANNULA";
break;
case "ventilator_oxygen_modality_oxygen_rate":
condition =
currentRound.ventilator_interface === "OXYGEN_SUPPORT" &&
(currentRound.ventilator_oxygen_modality === "NASAL_PRONGS" ||
currentRound.ventilator_oxygen_modality === "SIMPLE_FACE_MASK" ||
currentRound.ventilator_oxygen_modality === "NON_REBREATHING_MASK");
currentRound.ventilator_oxygen_modality !== "HIGH_FLOW_NASAL_CANNULA";
break;
}
switch (currentRound.ventilator_interface) {
case "OXYGEN_SUPPORT":
legend =
t(
`OXYGEN_MODALITY__${currentRound.ventilator_oxygen_modality}_short`,
) +
" (" +
t("RESPIRATORY_SUPPORT_SHORT__OXYGEN_SUPPORT") +
")";
legend = currentRound.ventilator_oxygen_modality
? `${t(`OXYGEN_MODALITY__${currentRound.ventilator_oxygen_modality}_short`)} (${t("RESPIRATORY_SUPPORT_SHORT__OXYGEN_SUPPORT")})`
: t("RESPIRATORY_SUPPORT_SHORT__OXYGEN_SUPPORT");
break;
case "INVASIVE":
legend =
t(`VENTILATOR_MODE__${currentRound.ventilator_mode}_short`) +
" (" +
t("RESPIRATORY_SUPPORT_SHORT__INVASIVE") +
")";
legend = currentRound.ventilator_mode
? `${t(`VENTILATOR_MODE__${currentRound.ventilator_mode}_short`)} (${t("RESPIRATORY_SUPPORT_SHORT__INVASIVE")})`
: t("RESPIRATORY_SUPPORT_SHORT__INVASIVE");
break;
case "NON_INVASIVE":
legend =
t(`VENTILATOR_MODE__${currentRound.ventilator_mode}_short`) +
" (" +
t("RESPIRATORY_SUPPORT_SHORT__NON_INVASIVE") +
")";
legend = currentRound.ventilator_mode
? `${t(`VENTILATOR_MODE__${currentRound.ventilator_mode}_short`)} (${t("RESPIRATORY_SUPPORT_SHORT__NON_INVASIVE")})`
: t("RESPIRATORY_SUPPORT_SHORT__NON_INVASIVE");
break;
}
return { condition, legend };
Expand All @@ -178,9 +162,9 @@ export const VentilatorPlot = ({
switch (ventilatorInterface) {
case "INVASIVE":
case "NON_INVASIVE":
return round.ventilator_mode;
return round.ventilator_mode ?? "None";
case "OXYGEN_SUPPORT":
return round.ventilator_oxygen_modality;
return round.ventilator_oxygen_modality ?? "None";
default:
return null;
}
Expand Down
21 changes: 14 additions & 7 deletions src/components/Facility/Consultations/VentilatorTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ export default function VentilatorTable(props: VentilatorTableProps) {
switch (ventilator_interface) {
case "INVASIVE":
case "NON_INVASIVE":
return t(`VENTILATOR_MODE__${ventilator_mode}`);
return ventilator_mode
? t(`VENTILATOR_MODE__${ventilator_mode}`)
: "None";
case "OXYGEN_SUPPORT":
return t(`OXYGEN_MODALITY__${ventilator_oxygen_modality}`);
return ventilator_oxygen_modality
? t(`OXYGEN_MODALITY__${ventilator_oxygen_modality}`)
: "None";
default:
return null;
}
Expand All @@ -55,9 +59,9 @@ export default function VentilatorTable(props: VentilatorTableProps) {
switch (ventilatorInterface) {
case "INVASIVE":
case "NON_INVASIVE":
return round.ventilator_mode;
return round.ventilator_mode ?? "None";
case "OXYGEN_SUPPORT":
return round.ventilator_oxygen_modality;
return round.ventilator_oxygen_modality ?? "None";
default:
return null;
}
Expand All @@ -74,8 +78,9 @@ export default function VentilatorTable(props: VentilatorTableProps) {
const nextInterfaceOrModality = getModeOrModality(nextRound);
if (
nextInterfaceOrModality &&
currentRound.ventilator_interface == nextRound.ventilator_interface &&
currentInterfaceOrModality == nextInterfaceOrModality
currentRound.ventilator_interface ===
nextRound.ventilator_interface &&
currentInterfaceOrModality === nextInterfaceOrModality
) {
index += 1;
} else {
Expand Down Expand Up @@ -105,6 +110,8 @@ export default function VentilatorTable(props: VentilatorTableProps) {
const sortedData: DailyRoundsModel[] = dailyRoundsList.sort(
compareByDateString("taken_at"),
);
const tableBody = VentilatorTableBody(sortedData);
if (!tableBody.length) return null;

return (
<div className="my-3 w-full overflow-x-scroll rounded-lg border bg-white px-4 pt-3 shadow">
Expand All @@ -122,7 +129,7 @@ export default function VentilatorTable(props: VentilatorTableProps) {
</th>
</tr>
</thead>
<tbody>{VentilatorTableBody(sortedData)}</tbody>
<tbody>{tableBody}</tbody>
</table>
</div>
);
Expand Down
Loading