-
Notifications
You must be signed in to change notification settings - Fork 16
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
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 d34945c
queries
Chris-Petty 077e646
stuff
Chris-Petty 48159aa
Fix infinite fetching
roxy-dao e06fb0f
Fix route for indicator page
roxy-dao 48c3c31
Use fragments
roxy-dao 1eaa4b6
Move page layout to common
roxy-dao 26cf0de
Fix route + pass in indicators to tab
roxy-dao 9b4a6ad
List Indicators
roxy-dao 40868c6
Update tab buttons
roxy-dao 65869c8
Detail view with list of indicators
roxy-dao dd587b6
App bar buttons for Indicator page
roxy-dao 1931780
Custom breadcrumb + remove entered line ids
roxy-dao 8858995
Fix imports
roxy-dao 25c76e6
Fragments for column and value
roxy-dao cf56818
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
roxy-dao d0bf66a
Separate onclick redirection for indicator buttons
roxy-dao babb20c
Hook to update indicator value
roxy-dao e0fa5d2
Hook to get previous and next indicator line row
roxy-dao 93a14ef
Implement footer for indicator line page with previous and next buttons
roxy-dao 62f8486
Change return
roxy-dao 4bd972b
Sort indicator lines to dsplay
roxy-dao 3ee7376
value input wipi
Chris-Petty 66eda41
Make list sizing smaller
roxy-dao 84be792
Small fixes
roxy-dao 1e9f628
Updating indicator values and value type error handling
Chris-Petty e75041c
remove unused draft hook
Chris-Petty fb32148
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty 288b2e7
translate indicators breadcrumbs
Chris-Petty a8a5525
Revert "remove unused draft hook"
Chris-Petty c5e1a68
index.js
Chris-Petty 0ae3de4
translate
Chris-Petty b2bb406
add AppRoute.Indicators
Chris-Petty 84f493f
translate
Chris-Petty 387ce3c
hide/show indicator buttons as required
Chris-Petty 64cf13d
remove broken tooltip
Chris-Petty 3e116e7
fix routing regression
Chris-Petty 02e36c1
indicators use draft state
Chris-Petty 205b170
remove fe logging
Chris-Petty 1d47a7d
filter requisitions program indicators correctly
Chris-Petty 32ba994
hide indicator buttons fixed
Chris-Petty 561e33a
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty 6f3a96e
maybe less loading jank?
Chris-Petty 12e83ca
make sure first indicator line is selected
Chris-Petty 01a6800
Hide unnecessary columns and rows
Chris-Petty 9e50d76
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty c7cbeb9
hide regimen indicators button if no values
lache-melvin 95e4f8f
hide hiv indicators button if no values
lache-melvin f6ee45f
Merge branch 'v2.4.0' into 5162-response-requisition-indicator-ui
Chris-Petty File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,9 +34,14 @@ export const IndicatorsTab = ({ | |
if (!indicators || indicators.length === 0) { | ||
return <NothingHere body={t('error.no-indicators')} />; | ||
} | ||
|
||
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)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
); | ||
|
||
const firstRegimenLine = regimenIndicators[0]?.lineAndColumns.sort( | ||
(a, b) => a.line.lineNumber - b.line.lineNumber | ||
)[0]?.line; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah XD