SORMAS-Foundation#2528 - Added translation, increased font size of bar labels

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -600,7 +600,9 @@ public interface Captions {
 	String dashboardShowEvents = "dashboardShowEvents";
 	String dashboardShowFirstDiseases = "dashboardShowFirstDiseases";
 	String dashboardShowMinimumEntries = "dashboardShowMinimumEntries";
+	String dashboardShowPercentageValues = "dashboardShowPercentageValues";
 	String dashboardShowRegions = "dashboardShowRegions";
+	String dashboardShowTotalValues = "dashboardShowTotalValues";
 	String dashboardShowUnconfirmedContacts = "dashboardShowUnconfirmedContacts";
 	String dashboardSuspect = "dashboardSuspect";
 	String dashboardSymptomatic = "dashboardSymptomatic";

sormas-api/src/main/resources/captions.properties

@@ -697,6 +697,8 @@ dashboardLastReportedDistrict=Last reported district
 dashboardFollowUpStatusChart=Follow-up Status Chart
 dashboardContactClassificationChart=Contact Classification Chart
 dashboardFollowUpUntilChart=Follow-Up Until Chart
+dashboardShowPercentageValues=Show percentage values
+dashboardShowTotalValues=Show total values
 
 defaultRegion=Default Region
 defaultDistrict=Default District

sormas-api/src/main/resources/captions_de-DE.properties

@@ -696,6 +696,8 @@ dashboardLastReportedDistrict=Zuletzt gemeldeter Landkreis
 dashboardFollowUpStatusChart=Nachverfolgungs-Statusdiagramm
 dashboardContactClassificationChart=Kontakt-Definitionskategorien-Diagramm
 dashboardFollowUpUntilChart=Nachverfolgung bis- Diagramm
+dashboardShowPercentageValues=Prozentwerte anzeigen
+dashboardShowTotalValues=Gesamtwerte anzeigen
 
 defaultRegion=Voreingestellte Bundesländer
 defaultDistrict=Voreingestellter Landkreis

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

@@ -4,6 +4,8 @@
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDataDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDefinitionDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramSeries;
+import de.symeda.sormas.api.i18n.Captions;
+import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.ui.highcharts.HighChart;
 
 import java.math.BigDecimal;
@@ -89,7 +91,11 @@ public void buildDiagramChart(String title) {
 		if (totalValues != null) {
 			hcjs.append(
 				" menuItemDefinitions: { togglePercentages: { onclick: function() { window.changeDiagramState_" + diagramDefinition.getDiagramId()
-					+ "(); }, text: '" + (showPercentage ? "Show total values" : "Show percentages") + "' } }, ");
+					+ "(); }, text: '"
+					+ (showPercentage
+						? I18nProperties.getCaption(Captions.dashboardShowTotalValues)
+						: I18nProperties.getCaption(Captions.dashboardShowPercentageValues))
+					+ "' } }, ");
 		}
 
 		hcjs.append(" buttons:{ contextButton:{ theme:{ fill: 'transparent' }");
@@ -143,7 +149,8 @@ public void buildDiagramChart(String title) {
 				hcjs.append("column: { stacking: 'normal'}");
 			}
 			if (showPercentage && totalValues != null) {
-				hcjs.append(stackMap.size() > 0 ? ", " : "").append("series: { dataLabels: { enabled: true, format: '{y} %'}}");
+				hcjs.append(stackMap.size() > 0 ? ", " : "")
+					.append("series: { dataLabels: { enabled: true, format: '{y} %', style: { fontSize: 14 + 'px' }}}");
 			}
 
 			hcjs.append("},");