#3419 - fixing spaces issue & #1754 - fixing Shared Exports to appe…

…ar only in case if 1 export does exist.
SORMAS-Foundation · Feb 17, 2021 · 86209eb · 86209eb
1 parent 53e4e47
commit 86209eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java
@@ -29,6 +29,7 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidColumnLocCss;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRow;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
+import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocsCss;
 import static de.symeda.sormas.ui.utils.LayoutUtil.inlineLocs;
 import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
 import static de.symeda.sormas.ui.utils.LayoutUtil.locCss;
@@ -150,7 +151,7 @@ public class CaseDataForm extends AbstractEditForm<CaseDataDto> {
 					fluidRowLocs(4, CaseDataDto.UUID, 3, CaseDataDto.REPORT_DATE, 5, CaseDataDto.REPORTING_USER) +
 					fluidRowLocs(4, CaseDataDto.CLINICAL_CONFIRMATION, 4, CaseDataDto.EPIDEMIOLOGICAL_CONFIRMATION, 4, CaseDataDto.LABORATORY_DIAGNOSTIC_CONFIRMATION) +
 					inlineLocs(CaseDataDto.CASE_CLASSIFICATION, CLASSIFICATION_RULES_LOC) +
-					fluidRowLocs(CaseDataDto.NOT_A_CASE_REASON_NEGATIVE_TEST, CaseDataDto.NOT_A_CASE_REASON_PHYSICIAN_INFORMATION,
+					fluidRowLocsCss(VSPACE_3, CaseDataDto.NOT_A_CASE_REASON_NEGATIVE_TEST, CaseDataDto.NOT_A_CASE_REASON_PHYSICIAN_INFORMATION,
 							CaseDataDto.NOT_A_CASE_REASON_DIFFERENT_PATHOGEN, CaseDataDto.NOT_A_CASE_REASON_OTHER) +
 					fluidRowLocs(CaseDataDto.NOT_A_CASE_REASON_DETAILS) +
 					fluidRow(

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/customexport/ExportConfigurationsLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/customexport/ExportConfigurationsLayout.java
@@ -77,11 +77,11 @@ public ExportConfigurationsLayout(
 		Label sharedExportsLabel =
 			new Label(I18nProperties.getPrefixCaption(ExportConfigurationDto.I18N_PREFIX, Captions.ExportConfiguration_sharedExports));
 		sharedExportsLabel.addStyleName(H3);
-		addComponent(sharedExportsLabel);
 
 		gridSharedExportsToPublic = new ExportConfigurationsGrid(exportType, availableProperties, propertyCaptionProvider, true);
 		if (gridSharedExportsToPublic.getNbOfSharedExportsToPublic() > 0) {
 			gridSharedExportsToPublic.setWidth(100, Unit.PERCENTAGE);
+			addComponent(sharedExportsLabel);
 			addComponent(gridSharedExportsToPublic);
 		}