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

Manual Entry Page #18

Merged
merged 18 commits into from
Dec 6, 2024
Merged

Manual Entry Page #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f4c0ee0
lay the groundwork
Nov 30, 2024
79bd9d2
modal templates and date picker
Nov 30, 2024
c568743
import mui icons
Nov 30, 2024
52238ef
implemented NewLogModal
Nov 30, 2024
3b8d8dd
implemented ConfirmCancelModal
Nov 30, 2024
6a093eb
implemented LogSavedSuccessModal
Nov 30, 2024
83e2135
refactoring
Nov 30, 2024
488fd74
implement meds (last dose) section
Dec 1, 2024
9b60a74
labs and pulses sections
Dec 1, 2024
9373bc7
inputs with units
Dec 1, 2024
be3c952
code cleanup
Dec 1, 2024
12e9a13
implement CLInputs
Dec 1, 2024
6033f1c
code cleanup
Dec 1, 2024
d6b803f
fix CLSelectInput behaviour
Dec 1, 2024
da44242
fix flex behaviour in examinations and investigations
Dec 1, 2024
38f6aed
limit numeric fields to positive values
Dec 6, 2024
bc3def5
resolve merge conflicts
Dec 6, 2024
4b6861f
resolve merge conflicts
Dec 6, 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
180 changes: 136 additions & 44 deletions frontend/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.

3 changes: 2 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@heroicons/react": "^2.2.0",
"@mui/icons-material": "^6.1.2",
"@mui/icons-material": "^6.1.9",
"@mui/material": "^6.1.2",
"@mui/x-date-pickers": "^7.23.0",
"@supabase/supabase-js": "^2.45.5",
"axios": "^1.7.7",
"pdfjs-dist": "^4.7.76",
Expand Down
Binary file added frontend/src/assets/labs-fishbones.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pulses.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 14 additions & 12 deletions frontend/src/components/Buttons/CLButtons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import "./CLButtons.css";
import "./CLButtons.css"

const DEFAULT_PRIMARY_CLASSNAME = "primary-variant-button";
const DEFAULT_SECONDARY_CLASSNAME = "secondary-variant-button";
const DEFAULT_PRIMARY_CLASSNAME = "primary-variant-button"
const DEFAULT_SECONDARY_CLASSNAME = "secondary-variant-button"

const DEFAULT_HEIGHT = "54px";
const DEFAULT_WIDTH = "fit-content";
const DEFAULT_TYPE = "button";
const DEFAULT_ON_CLICK = () => {};
const DEFAULT_HEIGHT = "54px"
const DEFAULT_WIDTH = "fit-content"
const DEFAULT_TYPE = "button"
const DEFAULT_ON_CLICK = () => {}

/**
* PRIMARY variant of the clinical logging button.
Expand All @@ -21,12 +21,13 @@ export const CLButtonPrimary = ({
type = DEFAULT_TYPE,
onClick = DEFAULT_ON_CLICK,
}) => {

const updatedClassName = className
? DEFAULT_PRIMARY_CLASSNAME + " " + className
: DEFAULT_PRIMARY_CLASSNAME;
: DEFAULT_PRIMARY_CLASSNAME

return (
<button
<button
className={updatedClassName}
type={type}
onClick={onClick}
Expand All @@ -53,10 +54,11 @@ export const CLButtonSecondary = ({
type = DEFAULT_TYPE,
onClick = DEFAULT_ON_CLICK,
}) => {
const updatedClassName = className
? DEFAULT_SECONDARY_CLASSNAME + " " + className
: DEFAULT_SECONDARY_CLASSNAME;

const updatedClassName = className
? DEFAULT_SECONDARY_CLASSNAME + " " + className
: DEFAULT_SECONDARY_CLASSNAME

return (
<button
className={updatedClassName}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Home/MainContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function MainContent() {
const [setSelectedLog] = useState(null);

const handleAddLogbook = () => {
navigate("/newLog");
navigate("/home");
};

const handleViewHistory = () => {
Expand Down
Loading
Loading