[11477] Validierung bei Patienten Erfassung (#379)

bundles/ch.elexis.core.data/src/ch/elexis/data/Messages.java

@@ -47,6 +47,9 @@ public final class Messages{
 	public static String GlobalActions_SecondForToday = ch.elexis.core.l10n.Messages.GlobalActions_SecondForToday;
 	public static String GlobalActions_SecondForTodayQuestion = ch.elexis.core.l10n.Messages.GlobalActions_SecondForTodayQuestion;
 	
+	public static String GlobalMessage_noNumericValue = ch.elexis.core.l10n.Messages.GlobalMessage_noNumericValue;
+	public static String GlobalMessage_valueNotSet = ch.elexis.core.l10n.Messages.GlobalMessage_valueNotSet;
+	
 	public static String LabItem_defaultGroup = ch.elexis.core.l10n.Messages.LabItem_defaultGroup;
 	public static String LabItem_longOwnLab = ch.elexis.core.l10n.Messages.LabItem_longOwnLab;
 	public static String LabItem_shortOwnLab = ch.elexis.core.l10n.Messages.LabItem_shortOwnLab;

bundles/ch.elexis.core.data/src/ch/elexis/data/Person.java

@@ -119,12 +119,17 @@ public class Person extends Kontakt {
 		throws PersonDataException{
 		name = name.trim();
 		vorname = vorname.trim();
-		if ((StringTool.isNothing(name)) || (!name.matches("[" + StringTool.wordChars + "\\s-]+"))) { //$NON-NLS-1$ //$NON-NLS-2$
-			throw new PersonDataException(PersonDataException.CAUSE.LASTNAME);
+		if (StringTool.isNothing(name)) { //$NON-NLS-1$ //$NON-NLS-2$
+			throw new PersonDataException(PersonDataException.CAUSE.LASTNAME,
+				Messages.GlobalMessage_valueNotSet);
+		}
+		if (!name.matches("[" + StringTool.wordChars + "\\s-]+")) {
+			throw new PersonDataException(PersonDataException.CAUSE.LASTNAME,
+				Messages.GlobalMessage_noNumericValue);
 		}
 		if ((!StringTool.isNothing(vorname))
 			&& (!vorname.matches("[" + StringTool.wordChars + "\\s-]+"))) { //$NON-NLS-1$ //$NON-NLS-2$
-			throw new PersonDataException(PersonDataException.CAUSE.FIRSTNAME);
+			throw new PersonDataException(PersonDataException.CAUSE.FIRSTNAME, Messages.GlobalMessage_noNumericValue);
 		}
 		String dat = StringTool.leer;
 		if (gebDat != null) {
@@ -256,7 +261,12 @@ public class Person extends Kontakt {
 		public CAUSE cause;
 		
 		PersonDataException(CAUSE cause){
-			super(causes[cause.ordinal()]);
+			super("'" + causes[cause.ordinal()] + "'");
+			this.cause = cause;
+		}
+		
+		PersonDataException(CAUSE cause, String additional){
+			super("'" +  causes[cause.ordinal()] + "'\n\n" + additional);
 			this.cause = cause;
 		}
 	}

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/Messages.java

@@ -525,6 +525,10 @@ public class Messages extends NLS {
 	public static String GlobalActions_ac_openhandbook;
 	public static String GlobalActions_plaBill;
 	public static String GlobalActions_saveasstartperspective;
+	
+	public static String GlobalMessage_noNumericValue;
+	public static String GlobalMessage_valueNotSet;
+
 	public static String HistoryLoader_LoadKonsMessage;
 	public static String HistoryLoader_Sorting;
 	public static String ListLoader_CouldntLoadData;

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages.properties

@@ -1955,6 +1955,10 @@ GlobalActions_plaBill = Plan bill
 
 GlobalActions_saveasstartperspective = Save as start perspective
 
+GlobalMessage_noNumericValue = Numeric values not allowed.
+
+GlobalMessage_valueNotSet = Value is not set.
+
 Gruppen_BitteGebenSieNameEin = Enter a name for the new role, please
 
 Gruppen_Gruppen = Groups
@@ -5438,3 +5442,4 @@ XIDEdit_ShowWith = Show with:
 XIDEdit_XidOpetions = XID options
 
 Zugriff_AccessRights = Access rights
+

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_de.properties

@@ -1961,6 +1961,10 @@ GlobalActions_plaBill = Plane Rechnungen
 
 GlobalActions_saveasstartperspective = Speichern als Start-Perspektive
 
+GlobalMessage_noNumericValue = Keine numerischen Zeichen erlaubt.
+
+GlobalMessage_valueNotSet = Wert ist nicht definiert.
+
 Gruppen_BitteGebenSieNameEin = Bitte geben Sie einen Namen f\u00FCr die neu zu erstellende Gruppe ein
 
 Gruppen_Gruppen = Gruppen