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

FLAG-67: Fix rendering of flags via simple objects that is currently broken in platform version greater than 2.5.* #77

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

ManojLL
Copy link
Contributor

@ManojLL ManojLL commented Jun 30, 2024

Description of what I changed

I added a key for the object return from PatientflagsDashboardFragmentController to the UI and fixed the flags rendering issue on the UI

image

Issue I worked on

see https://openmrs.atlassian.net/browse/FLAG-67

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@wikumChamith
Copy link
Member

@ManojLL this is not working form me.

Screenshot from 2024-06-30 10-12-48
Screenshot from 2024-06-30 10-12-43

@ManojLL
Copy link
Contributor Author

ManojLL commented Jun 30, 2024

@wikumChamith Flags are showing based on roles, could you please check your flags tags contain roles ?

@wikumChamith
Copy link
Member

@wikumChamith Flags are showing based on roles, could you please check your flags tags contain roles ?

Shouldn't both the legacy-ui and O2 behave in the same way?

@ManojLL
Copy link
Contributor Author

ManojLL commented Jun 30, 2024

@wikumChamith Flags are showing based on roles, could you please check your flags tags contain roles ?

Shouldn't both the legacy-ui and O2 behave in the same way?

no, Legacy UI shows all triaged flags to any user.

@wikumChamith
Copy link
Member

@wikumChamith Flags are showing based on roles, could you please check your flags tags contain roles ?

@dkayiwa what is your opinion on this, Should we display all the flags here or show the flags based on roles?

@dkayiwa
Copy link
Member

dkayiwa commented Jul 1, 2024

How about just maintaining how it has always been?

@wikumChamith
Copy link
Member

@ManojLL I am not seeing the styles related to the priority on the O2 UI.

Screenshot from 2024-07-10 16-02-13
Screenshot from 2024-07-10 16-02-04

FLAG 67: added spaces

FLAG-67: fixed flags style issue
@ManojLL
Copy link
Contributor Author

ManojLL commented Jul 10, 2024

@wikumChamith fix the style issue

@wikumChamith wikumChamith merged commit 7e25488 into openmrs:master Jul 10, 2024
3 checks passed
@@ -15,7 +15,7 @@
if (!response) {
${ ui.message("coreapps.none ") }
} else {
jq("#flags").html(response.replace("{=", "").replace("}", ""));
Copy link
Member

Choose a reason for hiding this comment

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

@wikumChamith does this work on lower platform versions?

Copy link
Member

Choose a reason for hiding this comment

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

I tested this on Reference Application 2.11.0 but this is not working there.

Copy link
Member

Choose a reason for hiding this comment

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

@wikumChamith meaning that this change breaks the module for those who are running lower platform versions.

ManojLL added a commit to ManojLL/openmrs-module-patientflags that referenced this pull request Jul 22, 2024
ManojLL added a commit to ManojLL/openmrs-module-patientflags that referenced this pull request Jul 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants