Merge pull request #12996 from SORMAS-Foundation/bugfix-12963-sample-save-notification

#12963 Incorrect saving message appears when saving a sample

Author: MateStrysewske

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestController.java

@@ -311,7 +311,9 @@ public void savePathogenTests(List<PathogenTestDto> pathogenTests, SampleReferen
 			handleAssociatedCase(pathogenTests, associatedCase, suppressNavigateToCase);
 		}
 
-		Notification.show(I18nProperties.getString(Strings.messagePathogenTestsSavedShort), TRAY_NOTIFICATION);
+		Notification.show(
+			I18nProperties.getString(pathogenTests.size() == 1 ? Strings.messagePathogenTestSavedShort : Strings.messagePathogenTestsSavedShort),
+			TRAY_NOTIFICATION);
 	}
 
 	private void handleAssociatedCase(List<PathogenTestDto> pathogenTests, CaseReferenceDto associatedCase, boolean suppressNavigateToCase) {

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/humansample/SampleController.java

@@ -304,6 +304,8 @@ private CommitDiscardWrapperComponent<SampleCreateForm> getSampleCreateComponent
 				if (callback != null) {
 					callback.run();
 				}
+
+				Notification.show(I18nProperties.getString(Strings.messageSampleSaved), Type.TRAY_NOTIFICATION);
 			}
 		});
 
@@ -360,6 +362,8 @@ public CommitDiscardWrapperComponent<SampleCreateForm> getSampleReferralCreateCo
 				SampleDto updatedSample = FacadeProvider.getSampleFacade().getSampleByUuid(existingSample.getUuid());
 				updatedSample.setReferredTo(referralSample.toReference());
 				FacadeProvider.getSampleFacade().saveSample(updatedSample);
+
+				Notification.show(I18nProperties.getString(Strings.messageSampleSaved), Type.TRAY_NOTIFICATION);
 			}
 		});
 		return createView;

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/humansample/SampleEditPathogenTestListHandler.java

@@ -39,6 +39,8 @@ public List<PathogenTestDto> getPathogenTests() {
 	}
 
 	public void saveAll(SampleReferenceDto sample) {
-		ControllerProvider.getPathogenTestController().savePathogenTests(pathogenTests, sample, true);
+		if (!pathogenTests.isEmpty()) {
+			ControllerProvider.getPathogenTestController().savePathogenTests(pathogenTests, sample, true);
+		}
 	}
 }