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

Commit 1aa653c

Browse files
Merge pull request SORMAS-Foundation#3793 from hzi-braunschweig/3473-bugfix-CampaignChartsBackgroundWhite
SORMAS-Foundation#3473 - make campaign charts background white
2 parents aff2027 + d7e67f9 commit 1aa653c

4 files changed

Lines changed: 62 additions & 6 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void buildDiagramChart(String title, boolean isCommunityGrouping) {
9696
hcjs.append("var options = {"
9797
+ "chart:{ "
9898
+ " type: 'column', "
99-
+ " backgroundColor: 'transparent', "
99+
+ " backgroundColor: 'white', "
100100
+ " borderRadius: '1', "
101101
+ " borderWidth: '1', "
102102
+ " spacing: [20, 20, 20, 20], "

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/contacts/ContactsEpiCurveComponent.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public void clearAndFillEpiCurveChart() {
280280
+ "', color: '#00BFFF', dataLabels: { allowOverlap: false }, data: [");
281281
for (int i = 0; i < convertedNumbers.length; i++) {
282282
if (i == convertedNumbers.length - 1) {
283-
hcjs.append(convertedNumbers[i] + "]}]};");
283+
hcjs.append(convertedNumbers[i] + "]}],");
284284
} else {
285285
hcjs.append(convertedNumbers[i] + ", ");
286286
}
@@ -311,13 +311,32 @@ public void clearAndFillEpiCurveChart() {
311311
+ "', color: '#00BFFF', dataLabels: { allowOverlap: false }, data: [");
312312
for (int i = 0; i < followUpUntilNumbers.length; i++) {
313313
if (i == followUpUntilNumbers.length - 1) {
314-
hcjs.append(followUpUntilNumbers[i] + "]}]};");
314+
hcjs.append(followUpUntilNumbers[i] + "]}],");
315315
} else {
316316
hcjs.append(followUpUntilNumbers[i] + ", ");
317317
}
318318
}
319319
}
320320

321+
hcjs.append("exporting: {\n" +
322+
" buttons: {\n" +
323+
" contextButton: {\n" +
324+
" menuItems: [\n" +
325+
" 'printChart',\n" +
326+
" 'separator',\n" +
327+
" 'downloadPNG',\n" +
328+
" 'downloadJPEG',\n" +
329+
" 'downloadPDF',\n" +
330+
" 'downloadSVG',\n" +
331+
" 'downloadCSV',\n" +
332+
" 'downloadXLS'\n" +
333+
" ]\n" +
334+
" }\n" +
335+
" }\n" +
336+
" }");
337+
338+
hcjs.append("};");
339+
321340
epiCurveChart.setHcjs(hcjs.toString());
322341
}
323342
}

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/surveillance/SurveillanceEpiCurveComponent.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void clearAndFillEpiCurveChart() {
197197
+ "', color: '#B22222', dataLabels: { allowOverlap: false }, data: [");
198198
for (int i = 0; i < confirmedNumbers.length; i++) {
199199
if (i == confirmedNumbers.length - 1) {
200-
hcjs.append(confirmedNumbers[i] + "]}]};");
200+
hcjs.append(confirmedNumbers[i] + "]}],");
201201
} else {
202202
hcjs.append(confirmedNumbers[i] + ", ");
203203
}
@@ -245,13 +245,32 @@ public void clearAndFillEpiCurveChart() {
245245
+ "', color: '#B22222', dataLabels: { allowOverlap: false }, data: [");
246246
for (int i = 0; i < deadNumbers.length; i++) {
247247
if (i == deadNumbers.length - 1) {
248-
hcjs.append(deadNumbers[i] + "]}]};");
248+
hcjs.append(deadNumbers[i] + "]}],");
249249
} else {
250250
hcjs.append(deadNumbers[i] + ", ");
251251
}
252252
}
253253
}
254254

255+
hcjs.append("exporting: {\n" +
256+
" buttons: {\n" +
257+
" contextButton: {\n" +
258+
" menuItems: [\n" +
259+
" 'printChart',\n" +
260+
" 'separator',\n" +
261+
" 'downloadPNG',\n" +
262+
" 'downloadJPEG',\n" +
263+
" 'downloadPDF',\n" +
264+
" 'downloadSVG',\n" +
265+
" 'downloadCSV',\n" +
266+
" 'downloadXLS'\n" +
267+
" ]\n" +
268+
" }\n" +
269+
" }\n" +
270+
" }");
271+
272+
hcjs.append("};");
273+
255274
epiCurveChart.setHcjs(hcjs.toString());
256275
}
257276
}

sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsView.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,25 @@ public void generateChart() {
724724

725725
hcjs.append("]}");
726726
}
727-
hcjs.append("]};");
727+
hcjs.append("],");
728+
729+
hcjs.append("exporting: {\n" +
730+
" buttons: {\n" +
731+
" contextButton: {\n" +
732+
" menuItems: [\n" +
733+
" 'printChart',\n" +
734+
" 'separator',\n" +
735+
" 'downloadPNG',\n" +
736+
" 'downloadJPEG',\n" +
737+
" 'downloadPDF',\n" +
738+
" 'downloadSVG',\n" +
739+
" 'downloadCSV',\n" +
740+
" 'downloadXLS'\n" +
741+
" ]\n" +
742+
" }\n" +
743+
" }\n" +
744+
" }");
745+
hcjs.append("};");
728746

729747
chart.setHcjs(hcjs.toString());
730748
resultsLayout.addComponent(chart);

0 commit comments

Comments
 (0)