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

[Dashboard] Implements initial markup for dashboard #421

Merged
merged 51 commits into from
Dec 8, 2024
Merged

[Dashboard] Implements initial markup for dashboard #421

merged 51 commits into from
Dec 8, 2024

Conversation

anchit-chandran
Copy link
Contributor

@anchit-chandran anchit-chandran commented Dec 6, 2024 •
edited
Loading

Signed-off-by: anchit-chandran anchit97123@gmail.com

Overview

image
  • implements the initial frontend markup for the dashboard, wiring up a few of the basic things from the view
  • @eatyourpeas, commented out the maps view code as couldn't get it to work for some reason (was getting a "cant resolve "submission" into field" error map.py::49) - would you be able to integrate this again? Relevant parts are in dashboard.py (view) and imd_map_card.html (template)
  • NOTE: I'm going to implement the waffle charts with javascript as I think plotly just getting in the way for it

Code changes

  • move dashboard view logic into own file
  • adds components for dashboard with react-style structuring
  • patient-level menu tab at bottom working thanks to beautiful htmx magic

other:

  • adds emmet to django html files in settings.json
  • auto run watch:css for tailwind when running s/up-debug

Documentation changes (done or required as a result of this PR)

nil

Related Issues

https://github.com/orgs/rcpch/projects/13?pane=issue&itemId=89491974&issue=rcpch%7Cnational-paediatric-diabetes-audit%7C414

@anchit-chandran
Merge branch 'live' into anchit/dashboard
c34a943 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
watch tailwind automatically
ce00f71 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
refactor dahsboard into own view. rm maps for now
a179a5b 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
package json update name
6b86bd8 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
udpate tailwind
3a5d688 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds watch css to start dev debug script
77dd091 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds card component
fde5918 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
initial mark up for card
8fb7ae2 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
audit_details_card markup
094e783 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
styling tweaks
d61a794 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds markup for Unit Report
67be25d 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds rest of unit report markup
2a3791b 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
markup for pt level report
a72a0e7 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds markup for pt table
a2d1a65 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
pull in info for pdu details
7d60bf4 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
pull in audit details
fc4ae1e 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds calc date time and disclaimer
81fb114 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
menu tabs with htmx magic!
249741c 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
initial addition of total eligible pts with waffle plot. Might be eas…
f625be5 
…ier to do this raw javascript

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
bold pt level report descrip title
b642472 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
Merge remote-tracking branch 'origin/live' into anchit/dashboard
3bec135 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
places imd template inside card
7c5765f 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
integrate map code into view and template
1660bf0 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
add emmet to django html
17aaabd 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
comment out map logic for now need @eatyourpeas to help implement
27ab458 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
rm stray divs
f572783 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
revert changes
1abdc33 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran anchit-chandran marked this pull request as ready for review December 6, 2024 09:44
eatyourpeas and others added 22 commits December 7, 2024 07:27
@eatyourpeas
first steps add choropleth map for deprivation
8854e88
@eatyourpeas
functioning imd map but slow
b0991e2
@anchit-chandran
commenting out maps in view for now just to get past error
36d6307 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
initial konva waffle chart
a6761b0 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@eatyourpeas
refactor location, new tooltips for patients, fix patient filter for …
6267ecb 
…location
@eatyourpeas
Merge branch 'anchit/dashboard' of https://github.com/rcpch/national-…
1b4440a 
…paediatric-diabetes-audit into anchit/dashboard
@anchit-chandran
adds waffle but weird proportions
37149b3 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
convert value counts to pct in view
a9050f1 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
better waffle proportions
50415da 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
nicer proportions
a3dfd47 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
extract drawWaffle into own module to be re used
eab9bd0 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
add group mouseenter events
a17f62b 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds legend
3120937 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
revert to plotly
f87fd80 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adjusts dimensions waffle, refines code
3f93742 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
rm print statement
f3eb27c 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
adds back in map view code, ready to refactor into own htmx async end…
36aaf1e 
…point

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
sets up map partial htmx but keeps crashing
02efb26 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
moves map card into own row
5df4a0f 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
loading spinner styles
2e0939e 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
clamp audit year to min 2024
636a780 
Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran
rm npm run watch css inside s dev debug as not working anyway, weird …
63d9e49 
…process interaction

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
@anchit-chandran anchit-chandran mentioned this pull request Dec 8, 2024
Closed
@anchit-chandran anchit-chandran merged commit 1cc5205 into live Dec 8, 2024
1 check passed
@anchit-chandran anchit-chandran deleted the anchit/dashboard branch December 8, 2024 14:22
@mbarton
Copy link
Member

mbarton commented Dec 8, 2024

Seen on STAGING (merged by @anchit-chandran 6 minutes and 33 seconds ago) Please check your changes!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eatyourpeas eatyourpeas eatyourpeas left review comments

@mbarton mbarton Awaiting requested review from mbarton

@reecehill reecehill Awaiting requested review from reecehill

Assignees
No one assigned
Labels
Seen-on-STAGING
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@anchit-chandran @mbarton @eatyourpeas