Skip to content

Commit

Permalink
#183 render region filter on jurisdiction
Browse files Browse the repository at this point in the history
  • Loading branch information
Anthony4m committed Jan 10, 2025
1 parent ddd9808 commit a55c2a4
Showing 1 changed file with 12 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import de.symeda.sormas.api.ebs.EbsTriagingDecision;
import de.symeda.sormas.api.ebs.SignalCategory;
import de.symeda.sormas.api.ebs.SignalOutcome;
import de.symeda.sormas.api.user.JurisdictionLevel;
import de.symeda.sormas.api.user.UserRight;
import de.symeda.sormas.app.BaseListActivity;
import de.symeda.sormas.app.PagedBaseListActivity;
Expand All @@ -26,6 +27,7 @@
import de.symeda.sormas.app.backend.ebs.Ebs;
import de.symeda.sormas.app.backend.region.District;
import de.symeda.sormas.app.backend.region.Region;
import de.symeda.sormas.app.backend.user.User;
import de.symeda.sormas.app.component.Item;
import de.symeda.sormas.app.component.menu.PageMenuItem;
import de.symeda.sormas.app.databinding.FilterEbsListLayoutBinding;
Expand All @@ -44,7 +46,7 @@ public class EbsListActivity extends PagedBaseListActivity {
private FilterEbsListLayoutBinding filterBinding;
public static boolean showWarningAlert = false;
public static int message = 0;

User currentUser = ConfigProvider.getUser();
public static void startActivity(Context context, SignalOutcome listFilter) {
BaseListActivity.startActivity(context, EbsListActivity.class, buildBundle(getStatusFilterPosition(signalOutcomes, listFilter)));
}
Expand Down Expand Up @@ -164,15 +166,15 @@ public void addFiltersToPageMenu() {
filterBinding.ebsSourceInformationFilter.initializeSpinner(sourceInformation);
filterBinding.triagingSignalCategoryFilter.initializeSpinner(signalCategory);
filterBinding.triagingTriagingDecisionFilter.initializeSpinner(triagingDecision);
filterBinding.ebsRegionFilter.initializeSpinner(InfrastructureDaoHelper.loadRegionsByServerCountry());
filterBinding.ebsRegionFilter.addValueChangedListener(e->{
filterBinding.ebsDistrictFilter.initializeSpinner(InfrastructureDaoHelper.loadDistricts((Region) e.getValue()));
});
filterBinding.ebsDistrictFilter.addValueChangedListener(e->{
filterBinding.ebsCommunityFilter.initializeSpinner(InfrastructureDaoHelper.loadCommunities((District) e.getValue()));
});


if(currentUser.getJurisdictionLevel() == JurisdictionLevel.NATION) {
filterBinding.ebsRegionFilter.initializeSpinner(InfrastructureDaoHelper.loadRegionsByServerCountry());
filterBinding.ebsRegionFilter.addValueChangedListener(e -> {
filterBinding.ebsDistrictFilter.initializeSpinner(InfrastructureDaoHelper.loadDistricts((Region) e.getValue()));
});
filterBinding.ebsDistrictFilter.addValueChangedListener(e -> {
filterBinding.ebsCommunityFilter.initializeSpinner(InfrastructureDaoHelper.loadCommunities((District) e.getValue()));
});
}
filterBinding.ebsReportDateTimeFilter.initializeDateField(getSupportFragmentManager());
filterBinding.triagingDecisionDateFilter.initializeDateField(getSupportFragmentManager());

Expand Down

0 comments on commit a55c2a4

Please sign in to comment.