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

Rewritten Export Routine CSV report in the new Rect UI #766

Closed
wants to merge 1 commit into from
Closed

Rewritten Export Routine CSV report in the new Rect UI #766

wants to merge 1 commit into from

Conversation

konavivekramakrishna
Copy link
Contributor

@konavivekramakrishna konavivekramakrishna commented Mar 7, 2024

This pr adds the Export Routine CSV report page

fixes : #762

Before:
image

After:
image

@konavivekramakrishna
Copy link
Contributor Author

Hello @mozzy11 and @rahul6603

Could you please review this? Additionally, I'm encountering trouble adding a new item to the sideNav. Are sideNav items fetched from the backend?

Also, could you suggest better names for the route and component related to this?

Thank you.

@mozzy11
Copy link
Collaborator

mozzy11 commented Mar 8, 2024

Thanks @konavivekramakrishna ,
Basically menu items are added using liquibase changesets to the DB ie here to I order to be compatible with the old jsp UI .,so we have the a single source of menu items for both the new and old UI

@mozzy11
Copy link
Collaborator

mozzy11 commented Mar 8, 2024

Which menu item did you need to add ??
i think for this report
you just need to change the report URL here
to point to your Route for this report ie
config.serverBaseUrl + "/ExternalReferralsReport?type=patient&report=referredOut". so that its routed to your new component.

And also for consistency , you can make use of this component that's already created to render the specific report based on the report type .

In other words /ExternalReferralsReport should load the RoutineIndex component and the specific report be rendered based on report type
https://github.com/I-TECH-UW/OpenELIS-Global-2/pull/740/files

Copy link
Collaborator

@mozzy11 mozzy11 left a comment

Choose a reason for hiding this comment

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

see above comments

@konavivekramakrishna
Copy link
Contributor Author

Thanks for the clarification @mozzy11

Got it, I will get it done

@mozzy11
Copy link
Collaborator

mozzy11 commented Mar 8, 2024

actually, use the
config.serverBaseUrl + "/RoutineReport?type=patient&report=referredOut"
i renamed it so that all new RoutineReports in the Rect UI can use that
https://github.com/I-TECH-UW/OpenELIS-Global-2/blob/develop_3x/frontend/src/App.js#L382

@konavivekramakrishna
Copy link
Contributor Author

@mozzy11

I have implemented the changes and attached the screenshot could you please review

@konavivekramakrishna
Copy link
Contributor Author

@mozzy11

can you please review

@@ -82,8 +82,7 @@ export const RoutineReportsMenu = {
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl + "/Report?type=patient&report=referredOut",
link:"/RoutineReport?type=patient&report=referredOut",
Copy link
Collaborator

@mozzy11 mozzy11 Mar 18, 2024

Choose a reason for hiding this comment

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

@konavivekramakrishna ,
@mherman22 is right . you worked on the wrong report menu item .
You were supposed to work on this ie it should become
"/RoutineReport?type=patient&report=CISampleRoutineExport",

@@ -88,6 +89,11 @@ const RoutineIndex = () => {
{type === "indicator" &&
report === "indicatorCDILNSPHIV" &&
(<HIVTestSummary/>)}
{
type === "patient" &&
report === "referredOut" &&
Copy link
Collaborator

Choose a reason for hiding this comment

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

the reort is supposed to be CISampleRoutineExport

Copy link
Collaborator

@mozzy11 mozzy11 left a comment

Choose a reason for hiding this comment

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

Use the right report menu item

Copy link

👋 Hi, @konavivekramakrishna,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot added the merge conflict Merge Conflicts label Mar 18, 2024
@konavivekramakrishna
Copy link
Contributor Author

closing duplicate of #833

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge conflict Merge Conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re-Write the Export Routine CSV report in the new Rect UI
3 participants