From 144c38661d85b72ce03541fc41295de9df030ba0 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 12 Jun 2023 09:03:39 +0200
Subject: [PATCH] Addon zu ValueMapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Auch wenn ein key in InvalidKeys ist soll das Mapping (temporär) gespeichert werden.
Dazu wird ein Eintrag hinzugefügt, aber nicht gespeichert. Das wird womöglich Probleme
geben wenn der Anwender hinterher die Mapping Seite öffnet und dann speichert?
---
 ENI2/ENI2.csproj        |  2 +-
 ENI2/Excel/ExcelUtil.cs | 46 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 5f32b611..bc7f24e5 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>7.12.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 61560d64..23ac26ec 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -2640,6 +2640,15 @@ namespace ENI2.Excel
                                 if (!createResult.Result)
                                     _log.WarnFormat("Error saving gender value mapping {0} -> {1}", gender, selectedValue);
                             }
+                            else
+                            {
+                                // add temporary
+                                ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.GENDER);
+                                vm.Key = gender;
+                                vm.Value = fid.SelectedValue;
+                                ValueMapping.Dicts[ValueMapping.MappingType.GENDER].Add(gender, vm);
+                            }
+                            
                             result = byte.Parse(fid.SelectedValue);
                         }
                     }
@@ -2691,7 +2700,16 @@ namespace ENI2.Excel
                                     Task<bool> createResult = Task.Run<bool>(async () => await ValueMapping.Create(ValueMapping.MappingType.DOCUMENT_TYPE, documentType, selectedValue));
                                     if (!createResult.Result)
                                         _log.WarnFormat("Error saving document type value mapping {0} -> {1}", documentType, selectedValue);
-                                }                                
+                                }
+                                else
+                                {
+                                    // add temporary
+                                    ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.DOCUMENT_TYPE);
+                                    vm.Key = documentType;
+                                    vm.Value = fid.SelectedValue;
+                                    ValueMapping.Dicts[ValueMapping.MappingType.DOCUMENT_TYPE].Add(documentType, vm);
+                                }
+
                                 result = byte.Parse(fid.SelectedValue);
                             }
                         }
@@ -2740,10 +2758,18 @@ namespace ENI2.Excel
                         if(!ValueMapping.InvalidKeys[ValueMapping.MappingType.COUNTRY].Contains(nationality))
                         {
                             string selectedValue = fid.SelectedValue;
-                            Task<bool> createResult = Task.Run<bool>(async () => await ValueMapping.Create(ValueMapping.MappingType.COUNTRY, nationality, selectedValue));
+                            Task<bool> createResult = Task.Run(async () => await ValueMapping.Create(ValueMapping.MappingType.COUNTRY, nationality, selectedValue));
                             if(!createResult.Result)
                                 _log.WarnFormat("Error saving nationality value mapping {0} -> {1}", nationality, selectedValue);
                         }
+                        else
+                        {
+                            // add temporary
+                            ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.COUNTRY);
+                            vm.Key = nationality;
+                            vm.Value = fid.SelectedValue;
+                            ValueMapping.Dicts[ValueMapping.MappingType.COUNTRY].Add(nationality, vm);
+                        }
                         result = fid.SelectedValue.Substring(0, 2); // attention manual entry
                     }
                 }
@@ -2793,6 +2819,14 @@ namespace ENI2.Excel
                             if (!createResult.Result)
                                 _log.WarnFormat("Error saving locode value mapping {0} -> {1}", val, selectedValue);
                         }
+                        else
+                        {
+                            // add temporary
+                            ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.LOCODE);
+                            vm.Key = val;
+                            vm.Value = fid.SelectedValue;
+                            ValueMapping.Dicts[ValueMapping.MappingType.LOCODE].Add(val, vm);
+                        }
                     }
                     else
                     {
@@ -2824,6 +2858,14 @@ namespace ENI2.Excel
                             if (!createResult.Result)
                                 _log.WarnFormat("Error saving locode value mapping {0} -> {1}", val, selectedValue);
                         }
+                        else
+                        {
+                            // add temporary
+                            ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.LOCODE);
+                            vm.Key = val;
+                            vm.Value = fid.SelectedValue;
+                            ValueMapping.Dicts[ValueMapping.MappingType.LOCODE].Add(val, vm);
+                        }
                     }
                 }
                 if (ValueMapping.Dicts[ValueMapping.MappingType.LOCODE].ContainsKey(val))