Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 93686b9

Browse files
committed
2644 - fix merge
1 parent bfe2b52 commit 93686b9

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardDataProvider.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ protected void refreshDiagramsData(String tabId, String subTabId) {
5353
campaignDiagramDefinitionsMap.get(campaign).forEach(campaignDashboardDiagramDto -> {
5454
final CampaignDashboardElement campaignDashboardElement = campaignDashboardDiagramDto.getCampaignDashboardElement();
5555
if (campaignDashboardElement.getTabId().equals(tabId) && (subTabId == null || campaignDashboardElement.getSubTabId().equals(subTabId))) {
56-
List<CampaignDiagramDataDto> diagramData = FacadeProvider.getCampaignFormDataFacade()
57-
.getDiagramData(
58-
campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignDiagramSeries(),
59-
new CampaignDiagramCriteria(campaign, area, region, district));
60-
campaignFormDataMap.put(campaignDashboardDiagramDto, diagramData);
61-
FacadeProvider.getCampaignFacade().validate(campaign);
62-
63-
64-
campaignDiagramDefinitionsMap.get(campaign).forEach(campaignDashboardDiagramDto -> {
6556
List<CampaignDiagramSeries> campaignSeriesTotal = campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignSeriesTotal();
6657
if (Objects.nonNull(campaignSeriesTotal)) {
6758
Optional populationGroup = campaignSeriesTotal.stream().filter(e -> Objects.nonNull(e.getPopulationGroup())).findFirst();
@@ -86,9 +77,8 @@ protected void refreshDiagramsData(String tabId, String subTabId) {
8677
} else {
8778
buildCampaignFormTotalsMap(campaignDashboardDiagramDto);
8879
}
89-
});
9080
}
91-
}
81+
});
9282
}
9383

9484
private void buildCampaignFormTotalsMap(CampaignDashboardDiagramDto campaignDashboardDiagramDto) {

0 commit comments

Comments
 (0)