Skip to content

HTML-875 - Provider widget should display existing values when editin… #328

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

Merged
mseaton merged 1 commit into from
Feb 5, 2026
Merged

HTML-875 - Provider widget should display existing values when editin… #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion api/src/main/java/org/openmrs/module/htmlformentry/widget/ProviderWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
public class ProviderWidget implements Widget {

private Provider initialValue;

private List<Provider> providers;

public ProviderWidget(List<Provider> providers) {
Expand Down Expand Up @@ -64,6 +64,11 @@ public String generateHtml(FormEntryContext context) {
else
return "";
}

// Ensure that if the form restricts providers, but a provider is already saved, it is present in the widget
if (context.getExistingEncounter() != null && initialValue != null && !providers.contains(initialValue)) {
providers.add(initialValue);
}

List<Provider> retiredProviders = new ArrayList<>();
List<Provider> nonRetiredProviders = new ArrayList<>();
Expand All @@ -76,6 +81,7 @@ public String generateHtml(FormEntryContext context) {
nonRetiredProviders.add(provider);
}
}

Collections.sort(nonRetiredProviders, new ProviderByPersonNameComparator());
Collections.sort(retiredProviders, new ProviderByPersonNameComparator());

Expand Down