Restored the possibility of empty value of residence facts (fix #510)

Serg-Norseman · Dec 14, 2023 · 3652de0 · 3652de0
1 parent 8e3581a
commit 3652de0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+            <li>Restored the possibility of empty value of residence facts.
             <li>Added localization to Japanese [Takashi Namba (難波鷹史)].
             <li>Fixed encoding detection when reading CSV files [Alex Zaytsev].
         </ul>

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+            <li>Восстановлена возможность пустого значения фактов местожительства.
             <li>Добавлена локализация на японский язык [Takashi Namba (難波鷹史)].
             <li>Исправлено определение кодировки при чтении CSV-файлов [Alexander Zaytsev].
         </ul>

diff --git a/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs b/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
@@ -86,7 +86,7 @@ public override bool Accept()
                 if (eventProps.Kind == PersonEventKind.ekFact) {
                     var attrValue = fView.Attribute.Text;
 
-                    if (string.IsNullOrEmpty(attrValue)) {
+                    if (string.IsNullOrEmpty(attrValue) && !eventProps.AcceptableEmpty) {
                         AppHost.StdDialogs.ShowError(LangMan.LS(LSID.FactValueIsInvalid));
                         throw new Exception();
                     }

diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
@@ -119,12 +119,14 @@ public sealed class EventStruct
             public LSID Name;
             public string Sign;
             public PersonEventKind Kind;
+            public bool AcceptableEmpty;
 
-            public EventStruct(LSID name, string sign, PersonEventKind kind)
+            public EventStruct(LSID name, string sign, PersonEventKind kind, bool acceptableEmpty = false)
             {
                 Name = name;
                 Sign = sign;
                 Kind = kind;
+                AcceptableEmpty = acceptableEmpty;
             }
         }
 
@@ -386,7 +388,7 @@ static GKData()
                 new EventStruct(LSID.Fact, GEDCOMTagName.FACT, PersonEventKind.ekFact),
                 new EventStruct(LSID.Religion, GEDCOMTagName.RELI, PersonEventKind.ekFact),
                 new EventStruct(LSID.Nationality, GEDCOMTagName.NATI, PersonEventKind.ekFact),
-                new EventStruct(LSID.Residence, GEDCOMTagName.RESI, PersonEventKind.ekFact),
+                new EventStruct(LSID.Residence, GEDCOMTagName.RESI, PersonEventKind.ekFact, true),
                 new EventStruct(LSID.PhysicalDesc, GEDCOMTagName.DSCR, PersonEventKind.ekFact),
                 new EventStruct(LSID.NationalIDNumber, GEDCOMTagName.IDNO, PersonEventKind.ekFact),
                 new EventStruct(LSID.SocialSecurityNumber, GEDCOMTagName.SSN, PersonEventKind.ekFact),