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

[draft] Scheduling #9076

Closed
wants to merge 139 commits into from
Closed
Show file tree
Hide file tree
Changes from 137 commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
b1222aa
basic scheduling list and create (ui only)
rithviknishad Nov 10, 2024
1637e00
WIP Microfrontends; Add few shadcn components
gigincg Nov 10, 2024
2918119
Merge branch 'develop' into microfrontend
gigincg Nov 10, 2024
1d04e73
Exceptions UI
rithviknishad Nov 11, 2024
6b63d80
switch to using shadcn's checkbox
rithviknishad Nov 11, 2024
3d7d6d8
switch schedule template creation to use shadcn components
rithviknishad Nov 11, 2024
a2f25e0
refactor
rithviknishad Nov 14, 2024
bf8e2f0
Merge remote-tracking branch 'origin' into rithviknishad/feat/scheduling
rithviknishad Nov 14, 2024
a54d71a
add lockfile
rithviknishad Nov 14, 2024
3a28ce7
Calendar component
rithviknishad Nov 18, 2024
029d11e
fixed issue with aborted requests setting a response and being reatte…
rithviknishad Nov 19, 2024
ce4c998
move calendar month control state to parent
rithviknishad Nov 20, 2024
66b151a
Improve Writable type to recursively apply the logic for nested objects
rithviknishad Nov 20, 2024
c910111
Cleanup Meta field
gigincg Nov 22, 2024
4497313
Merge develop into microfrontend
gigincg Nov 22, 2024
b0b0880
Solve Compilation Issues
gigincg Nov 23, 2024
4ebd325
WIP: Microfrontends without Shared Deps
gigincg Nov 24, 2024
92f24fd
PoC: Dynamic Loaded Microfrontends with Dynamic import
gigincg Nov 25, 2024
4d5fae7
Experimenting with Builds
gigincg Nov 25, 2024
20754eb
Merge branch 'develop' into microfrontend
gigincg Nov 25, 2024
94c8217
Disable Deps sharing
gigincg Nov 25, 2024
efbf43c
Configure rollup as platform-deps
gigincg Nov 25, 2024
ca3e118
Switch out of SWC
gigincg Nov 25, 2024
370416a
add couple of shadcn components
rithviknishad Nov 25, 2024
e36f5d2
integrate exceptions APIs
rithviknishad Nov 25, 2024
9b982c1
Revert to pre-mf config
gigincg Nov 25, 2024
dbc9443
Fix Microfrontend URL; Update build command
gigincg Nov 25, 2024
cba055f
Reinclude the setup script for the sake of the pluginMap
gigincg Nov 25, 2024
2bf352e
Add optional deps for rollup
gigincg Nov 25, 2024
dd1cdf9
add postinstall
gigincg Nov 25, 2024
5900873
Reconfigure platform deps script
gigincg Nov 25, 2024
29ba23c
Switch Microfrontend url to https
gigincg Nov 25, 2024
700b2f6
integrate calendar cells with actual data
rithviknishad Nov 25, 2024
d94bd4d
Share: Plausible, hooks, icons
gigincg Nov 26, 2024
ae364be
Few more shared components
gigincg Nov 26, 2024
79e2910
Merge branch 'develop' into microfrontend
gigincg Nov 26, 2024
e7ace12
remove console logs
rithviknishad Nov 26, 2024
4830286
Add separator
rithviknishad Nov 28, 2024
04a89b0
Merge branch 'develop' into rithviknishad/feat/scheduling
rithviknishad Nov 29, 2024
a8cc72f
update lockfile
rithviknishad Nov 29, 2024
6290192
Add base for fhir forms
bodhish Dec 1, 2024
089ac1d
Add custom types to questionnaire
bodhish Dec 1, 2024
80b91c1
Merge branch 'develop' into rithviknishad/feat/scheduling
rithviknishad Dec 2, 2024
8faf79b
Create Appointment UI
rithviknishad Dec 2, 2024
5acb648
appointment token
rithviknishad Dec 2, 2024
41058d5
A lot of changes
bodhish Dec 5, 2024
a8fcb82
Fix the types for questionnaire
bodhish Dec 5, 2024
8e32ffd
Refactor types
bodhish Dec 5, 2024
e0bb9c3
Add more forms
bodhish Dec 5, 2024
a9b39f2
Testing Remote MFE Setup
gigincg Dec 6, 2024
e1b0608
Update env; Remove typedef
gigincg Dec 6, 2024
6279488
Update Scripts; Vite
gigincg Dec 6, 2024
f5c6ba5
Add notes for questions
bodhish Dec 6, 2024
a52cdc0
Remove Custom Build Configs
gigincg Dec 6, 2024
c601ae5
Switch back to build folder
gigincg Dec 6, 2024
e75ac95
Support batch requests
bodhish Dec 7, 2024
472ef5d
Add prevent default for notes
bodhish Dec 7, 2024
b35c9ba
Minor styling changes
bodhish Dec 7, 2024
e7bea62
Add a page in patient encounter
bodhish Dec 7, 2024
e768bd5
Use useMutation instead of request
bodhish Dec 7, 2024
d61d975
Rename to EncounterQuestionnaire
bodhish Dec 7, 2024
ce927bf
More changes
bodhish Dec 8, 2024
425be26
Update styling
bodhish Dec 8, 2024
1a02bc3
Show add form in all cases
bodhish Dec 8, 2024
29be314
Merge branch 'develop' into form-field-v1
bodhish Dec 8, 2024
34858e9
Merge branch 'develop' into microfrontend
gigincg Dec 9, 2024
3b1d505
Minor types fix
bodhish Dec 9, 2024
c70820f
Fix types for enable when
bodhish Dec 9, 2024
1ea3714
Medication Search
rithviknishad Dec 9, 2024
c91e511
Fix a type error in tequest
bodhish Dec 9, 2024
f1a2617
fix typo in medication request types
rithviknishad Dec 9, 2024
61f682d
Add form for allergy
bodhish Dec 10, 2024
d829478
remove duplicate types and add medication request
rithviknishad Dec 10, 2024
492b4f5
add medication request draft UI
rithviknishad Dec 10, 2024
eacae8d
Merge branch 'microfrontend' into form-field-v1
gigincg Dec 10, 2024
b9fd738
Improve MFE vite config
gigincg Dec 10, 2024
91ba84c
remove default medication
rithviknishad Dec 10, 2024
6cd331f
add reusable component `ValueSetSelect`
rithviknishad Dec 10, 2024
d74b61e
autoclose valueset select dropdown upon selection and other improvements
rithviknishad Dec 10, 2024
b8eafcb
medication request: add route, site, method and additional instructions
rithviknishad Dec 10, 2024
d30f5c8
Add support for quantity
bodhish Dec 10, 2024
1865b2c
Refactor types
bodhish Dec 10, 2024
fd29e59
Add Support for Condition
gigincg Dec 10, 2024
f64289c
Merge branch 'form-field-v1' of github.com:coronasafe/care_fe into fo…
gigincg Dec 10, 2024
221c548
Rename types
bodhish Dec 12, 2024
108a469
Merge branch 'develop' into form-field-v1
bodhish Dec 12, 2024
d1fba3b
Merge branch 'develop' into form-field-v1
rithviknishad Dec 12, 2024
d75387e
update error page in UserHome
rithviknishad Dec 12, 2024
91fa294
Minor Changes for Quesstionnaire, Remove Principal Diagnosis
gigincg Dec 13, 2024
f60063d
Add view for forms and observations
bodhish Dec 13, 2024
83d646d
Clean up props from QuestionnaireResponseView
bodhish Dec 13, 2024
31f4499
Switch to default react plugin for vite
gigincg Dec 13, 2024
56d570f
Add esbuild/linux
gigincg Dec 13, 2024
f9e056f
Update package-lock
gigincg Dec 13, 2024
a5c9b0e
Switch node version; Remove NPM FLAGS
gigincg Dec 13, 2024
138442d
appointment APIs for testing
rithviknishad Dec 13, 2024
5752414
Add reference for batch request
bodhish Dec 13, 2024
df88450
Merge branch 'develop' into form-field-v1
rithviknishad Dec 13, 2024
5177f81
Add a public page, facility public change and udpate resource request
bodhish Dec 13, 2024
29cd4ad
partially complete med req add UI
rithviknishad Dec 13, 2024
a61ba46
switch to slot size and tokens per slot inputs instead of tokens allo…
rithviknishad Dec 13, 2024
e23f750
switch to using pythons convention for weekdays
rithviknishad Dec 13, 2024
8ae3769
facility cards and detail initial styling
Jacobjeevan Dec 13, 2024
ffb6285
appointment creation wired with API
rithviknishad Dec 13, 2024
ff1d1c2
some cleanups and refactors
rithviknishad Dec 14, 2024
3237671
Merge branch 'develop' into rithviknishad/feat/scheduling
rithviknishad Dec 14, 2024
ec0f261
Merge branch 'develop' into rithviknishad/feat/scheduling
rithviknishad Dec 14, 2024
69ec472
fix issues
rithviknishad Dec 14, 2024
9b9debe
facility details, mock data and appointments pg
Jacobjeevan Dec 14, 2024
9815682
improve react query error typesafety
rithviknishad Dec 14, 2024
2f3cc6f
adding patient registration
Jacobjeevan Dec 14, 2024
f782133
Appointments Board View
rithviknishad Dec 14, 2024
211e3de
play with shadows and stuff...
rithviknishad Dec 14, 2024
9d4a496
Add support for financial
bodhish Dec 14, 2024
7f2997e
fix token preview page barcode and other layout adjustments
rithviknishad Dec 14, 2024
52fae76
Support Diagnosis, Symptoms
gigincg Dec 14, 2024
592096f
Update types
gigincg Dec 14, 2024
c0fb0ee
Add resource request support for patients
bodhish Dec 14, 2024
e87f5e2
Show linked patients in resource request
bodhish Dec 14, 2024
b573fb4
Merge branch 'develop' into form-field-v1
bodhish Dec 14, 2024
e120e7c
Merge branch 'form-field-v1' of github.com:ohcnetwork/care_fe into fo…
Jacobjeevan Dec 14, 2024
3702aba
show appointments in tab
rithviknishad Dec 15, 2024
e7ef10b
Merge remote-tracking branch 'origin' into rithviknishad/feat/scheduling
rithviknishad Dec 15, 2024
7eb4905
type safety
rithviknishad Dec 15, 2024
9afcc59
Appointments Flow
Jacobjeevan Dec 15, 2024
a59500e
Cleanup capacity related fields from facility
bodhish Dec 15, 2024
a680e69
Clean up models
bodhish Dec 15, 2024
6d66836
Move schedule management page to users page
rithviknishad Dec 15, 2024
51dc1c3
revert lockfile changes
rithviknishad Dec 15, 2024
c464e63
Clean up unused type references
bodhish Dec 15, 2024
c47a541
Merge branch 'cleanup-facility' into form-field-v1
bodhish Dec 15, 2024
d2a6e12
Appointments flow: adjustments
Jacobjeevan Dec 15, 2024
6c8cd61
Switch to QR code for Appointment Card; Add care logo
rithviknishad Dec 15, 2024
6fa3520
hide things not planned for now and remove redundant fields
rithviknishad Dec 15, 2024
9da93aa
Add viewer for symptoms and diagnosis
bodhish Dec 15, 2024
cfa055d
minor fixes/styling changes
Jacobjeevan Dec 15, 2024
20cc9b2
Merge branch 'form-field-v1' into rithviknishad/feat/scheduling
rithviknishad Dec 15, 2024
2c57ce9
Integrate Schedule APIs
rithviknishad Dec 15, 2024
c9726a9
slots for a day; partial.
rithviknishad Dec 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
2 changes: 2 additions & 0 deletions .cursorrules
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ General Guidelines

- Care uses a custom useQuery hook to fetch data from the API. (Docs @ /Utils/request/useQuery)
- APIs are defined in the api.tsx file.
- Use raviger for routing.
- Use care icons for icons.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ REACT_APP_COVER_IMAGE_ALT=https://cdn.ohc.network/care_logo.svg
REACT_PUBLIC_URL=https://care.ohc.network

# Care API URL without the /api prefix
REACT_CARE_API_URL=https://careapi.ohc.network
REACT_CARE_API_URL=https://care-api.do.ohc.network

# Dev envs
ESLINT_NO_DEV_ERRORS=true
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,7 @@ cypress/fixtures/token.json
# Care Apps
/apps/*
src/pluginMap.ts
/apps_backup/*
/apps_backup/*

# Federation Temp files
/.__mf__temp
1 change: 0 additions & 1 deletion care.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const logo = (value?: string, fallback?: ILogo) => {
try {
return JSON.parse(value) as ILogo;
} catch {
// TODO: define vite plugin to validate care.config.ts during build step
return fallback;
}
};
Expand Down
5 changes: 2 additions & 3 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[build]
publish = "build/"
publish = "build"
command = "CI='' npm run build"

[build.environment]
NODE_VERSION = "20.12.0"
NPM_FLAGS = "--legacy-peer-deps"
NODE_VERSION = "22.11.0"
NODE_OPTIONS = "--max_old_space_size=4096"

[[redirects]]
Expand Down
Loading
Loading