dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addon zu ValueMapping

Browse Source 
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?
This commit is contained in:
Daniel Schick 2023-06-12 09:03:39 +02:00
parent 2fe98ca6ae
commit 144c38661d
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/ENI2.csproj
View File

@ -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>

46
ENI2/Excel/ExcelUtil.cs
View File

@ -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))