SORMAS-Foundation#3005 - Caption change, layout adjustments

Author: MateStrysewske

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

@@ -987,6 +987,7 @@ public interface Captions {
 	String HealthConditions_otherConditions = "HealthConditions.otherConditions";
 	String HealthConditions_sickleCellDisease = "HealthConditions.sickleCellDisease";
 	String HealthConditions_tuberculosis = "HealthConditions.tuberculosis";
+	String importCancelImport = "importCancelImport";
 	String importDetailed = "importDetailed";
 	String importDownloadCaseImportTemplate = "importDownloadCaseImportTemplate";
 	String importDownloadDataDictionary = "importDownloadDataDictionary";

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

@@ -1109,6 +1109,7 @@ importImports=%d Imported
 importLineListing=Line Listing Import
 importProcessed=%d/%d Processed
 importSkips=%d Skipped
+importCancelImport=Cancel import
 
 #Lab Message
 LabMessage=Lab Message

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataSelectionField.java

@@ -82,12 +82,12 @@ private void addFormDataDetailsComponent() {
 		Label newFormDataHeading = new Label(I18nProperties.getString(Strings.headingCampaignFormDataDuplicateNew));
 		CssStyles.style(newFormDataHeading, CssStyles.H3);
 		formDataDetailsLayout.addComponent(newFormDataHeading);
-		formDataDetailsLayout.addComponent(buildFormDataDetailsComponent(newData));
+		formDataDetailsLayout.addComponent(buildFormDataDetailsComponent(newData, false));
 
 		Label existingFormDataHeading = new Label(I18nProperties.getString(Strings.headingCampaignFormDataDuplicateExisting));
 		CssStyles.style(existingFormDataHeading, CssStyles.H3);
 		formDataDetailsLayout.addComponent(existingFormDataHeading);
-		formDataDetailsLayout.addComponent(buildFormDataDetailsComponent(existingData));
+		formDataDetailsLayout.addComponent(buildFormDataDetailsComponent(existingData, true));
 
 		addComponent(formDataDetailsLayout);
 	}
@@ -97,7 +97,7 @@ private void addButtons() {
 		HorizontalLayout buttonLayout = new HorizontalLayout();
 		buttonLayout.setWidthUndefined();
 
-		Button btnCancel = new Button(I18nProperties.getCaption(Captions.actionCancel));
+		Button btnCancel = new Button(I18nProperties.getCaption(Captions.importCancelImport));
 		btnCancel.addClickListener(e -> cancelCallback.run());
 		buttonLayout.addComponent(btnCancel);
 
@@ -114,7 +114,7 @@ private void addButtons() {
 		setComponentAlignment(buttonLayout, Alignment.MIDDLE_RIGHT);
 	}
 
-	private HorizontalLayout buildFormDataDetailsComponent(CampaignFormDataDto formData) {
+	private HorizontalLayout buildFormDataDetailsComponent(CampaignFormDataDto formData, boolean existingData) {
 		HorizontalLayout formDataLayout = new HorizontalLayout();
 		formDataLayout.setSpacing(true);
 		{
@@ -138,15 +138,17 @@ private HorizontalLayout buildFormDataDetailsComponent(CampaignFormDataDto formD
 			fdFormDate.setWidthUndefined();
 			formDataLayout.addComponent(fdFormDate);
 
-			Label fdCreatingUser = new Label(formData.getCreatingUser() != null ? formData.getCreatingUser().toString() : "");
-			fdCreatingUser.setCaption(I18nProperties.getPrefixCaption(CampaignFormDataDto.I18N_PREFIX, CampaignFormDataDto.CREATING_USER));
-			fdCreatingUser.setWidthUndefined();
-			formDataLayout.addComponent(fdCreatingUser);
-
-			Label fdCreationDate = new Label(DateFormatHelper.formatDate(formData.getCreationDate()));
-			fdCreationDate.setCaption(I18nProperties.getPrefixCaption(CampaignFormDataDto.I18N_PREFIX, CampaignFormDataDto.CREATION_DATE));
-			fdCreationDate.setWidthUndefined();
-			formDataLayout.addComponent(fdCreationDate);
+			if (existingData) {
+				Label fdCreatingUser = new Label(formData.getCreatingUser() != null ? formData.getCreatingUser().toString() : "");
+				fdCreatingUser.setCaption(I18nProperties.getPrefixCaption(CampaignFormDataDto.I18N_PREFIX, CampaignFormDataDto.CREATING_USER));
+				fdCreatingUser.setWidthUndefined();
+				formDataLayout.addComponent(fdCreatingUser);
+
+				Label fdCreationDate = new Label(DateFormatHelper.formatDate(formData.getCreationDate()));
+				fdCreationDate.setCaption(I18nProperties.getPrefixCaption(CampaignFormDataDto.I18N_PREFIX, CampaignFormDataDto.CREATION_DATE));
+				fdCreationDate.setWidthUndefined();
+				formDataLayout.addComponent(fdCreationDate);
+			}
 		}
 
 		return formDataLayout;