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

5162 response requisition indicator UI #5523

Merged
merged 49 commits into from
Nov 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
894ebc7
indicators gql generate
Chris-Petty Nov 17, 2024
d34945c
queries
Chris-Petty Nov 18, 2024
077e646
stuff
Chris-Petty Nov 20, 2024
48159aa
Fix infinite fetching
roxy-dao Nov 20, 2024
e06fb0f
Fix route for indicator page
roxy-dao Nov 20, 2024
48c3c31
Use fragments
roxy-dao Nov 20, 2024
1eaa4b6
Move page layout to common
roxy-dao Nov 20, 2024
26cf0de
Fix route + pass in indicators to tab
roxy-dao Nov 20, 2024
9b4a6ad
List Indicators
roxy-dao Nov 20, 2024
40868c6
Update tab buttons
roxy-dao Nov 20, 2024
65869c8
Detail view with list of indicators
roxy-dao Nov 20, 2024
dd587b6
App bar buttons for Indicator page
roxy-dao Nov 20, 2024
1931780
Custom breadcrumb + remove entered line ids
roxy-dao Nov 20, 2024
8858995
Fix imports
roxy-dao Nov 20, 2024
25c76e6
Fragments for column and value
roxy-dao Nov 20, 2024
cf56818
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
roxy-dao Nov 20, 2024
d0bf66a
Separate onclick redirection for indicator buttons
roxy-dao Nov 20, 2024
babb20c
Hook to update indicator value
roxy-dao Nov 21, 2024
e0fa5d2
Hook to get previous and next indicator line row
roxy-dao Nov 21, 2024
93a14ef
Implement footer for indicator line page with previous and next buttons
roxy-dao Nov 21, 2024
62f8486
Change return
roxy-dao Nov 21, 2024
4bd972b
Sort indicator lines to dsplay
roxy-dao Nov 21, 2024
3ee7376
value input wipi
Chris-Petty Nov 21, 2024
66eda41
Make list sizing smaller
roxy-dao Nov 21, 2024
84be792
Small fixes
roxy-dao Nov 21, 2024
1e9f628
Updating indicator values and value type error handling
Chris-Petty Nov 22, 2024
e75041c
remove unused draft hook
Chris-Petty Nov 24, 2024
fb32148
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty Nov 25, 2024
288b2e7
translate indicators breadcrumbs
Chris-Petty Nov 25, 2024
a8a5525
Revert "remove unused draft hook"
Chris-Petty Nov 25, 2024
c5e1a68
index.js
Chris-Petty Nov 25, 2024
0ae3de4
translate
Chris-Petty Nov 25, 2024
b2bb406
add AppRoute.Indicators
Chris-Petty Nov 25, 2024
84f493f
translate
Chris-Petty Nov 25, 2024
387ce3c
hide/show indicator buttons as required
Chris-Petty Nov 25, 2024
64cf13d
remove broken tooltip
Chris-Petty Nov 26, 2024
3e116e7
fix routing regression
Chris-Petty Nov 26, 2024
02e36c1
indicators use draft state
Chris-Petty Nov 26, 2024
205b170
remove fe logging
Chris-Petty Nov 26, 2024
1d47a7d
filter requisitions program indicators correctly
Chris-Petty Nov 26, 2024
32ba994
hide indicator buttons fixed
Chris-Petty Nov 26, 2024
561e33a
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty Nov 26, 2024
6f3a96e
maybe less loading jank?
Chris-Petty Nov 26, 2024
12e83ca
make sure first indicator line is selected
Chris-Petty Nov 27, 2024
01a6800
Hide unnecessary columns and rows
Chris-Petty Nov 27, 2024
9e50d76
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty Nov 27, 2024
c7cbeb9
hide regimen indicators button if no values
lache-melvin Nov 27, 2024
95e4f8f
hide hiv indicators button if no values
lache-melvin Nov 27, 2024
f6ee45f
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty Nov 27, 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
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,14 @@ export const IndicatorsTab = ({
if (!indicators || indicators.length === 0) {
return <NothingHere body={t('error.no-indicators')} />;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@roxy-dao shouldn't this be a loading state page rather than a no indicators page?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah XD

}

const regimenIndicators = indicators.filter(
indicator => indicator.code === 'REGIMEN'
indicator =>
indicator.code === 'REGIMEN' &&
// Should only include regimen indicators if they have at least one column with a value
indicator.lineAndColumns.some(line => line.columns.some(c => c.value))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

coming from rust more recently I was like ugh I though js had an Array.any 😭. Been using filter and find hahahaaaaaaaa

);

const firstRegimenLine = regimenIndicators[0]?.lineAndColumns.sort(
(a, b) => a.line.lineNumber - b.line.lineNumber
)[0]?.line;
Expand Down