diff --git a/.gitignore b/.gitignore index 0978652d6..ac93037cf 100644 --- a/.gitignore +++ b/.gitignore @@ -650,4 +650,7 @@ obj /logs/mobilelog.txt /BeWo.Styles/bin /BeWo.Styles/obj -/Tools/KTDReaderGUI/.vs* \ No newline at end of file +/Tools/KTDReaderGUI/.vs* +/Tools/KTDReaderGUI/packages +/Tools/KTDReaderGUI/KTDReaderGUI/bin/Debug +/Tools/KTDReaderGUI/KTDReaderGUI/bin/Release diff --git a/BeWo.Styles/Colors/Colors.xaml b/BeWo.Styles/Colors/Colors.xaml index af79deddd..b8e174425 100644 --- a/BeWo.Styles/Colors/Colors.xaml +++ b/BeWo.Styles/Colors/Colors.xaml @@ -7,4 +7,10 @@ + + + + + + \ No newline at end of file diff --git a/Tools/KTDReaderGUI/KTDReaderGUI.sln b/Tools/KTDReaderGUI/KTDReaderGUI.sln index 76aab4d4e..a89747d65 100644 --- a/Tools/KTDReaderGUI/KTDReaderGUI.sln +++ b/Tools/KTDReaderGUI/KTDReaderGUI.sln @@ -7,20 +7,49 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KTDReaderGUI", "KTDReaderGU EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "..\..\Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo.Styles", "..\..\BeWo.Styles\BeWo.Styles.csproj", "{9BAB16DE-E284-4B57-BD09-763FC5CE521A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "..\..\Shared\Shared.csproj", "{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "..\..\Controls\Controls.csproj", "{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + DebugRemote|Any CPU = DebugRemote|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU {F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Release|Any CPU.Build.0 = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU + {9BAB16DE-E284-4B57-BD09-763FC5CE521A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BAB16DE-E284-4B57-BD09-763FC5CE521A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BAB16DE-E284-4B57-BD09-763FC5CE521A}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {9BAB16DE-E284-4B57-BD09-763FC5CE521A}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {9BAB16DE-E284-4B57-BD09-763FC5CE521A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BAB16DE-E284-4B57-BD09-763FC5CE521A}.Release|Any CPU.Build.0 = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.DebugRemote|Any CPU.ActiveCfg = DebugRemote|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.DebugRemote|Any CPU.Build.0 = DebugRemote|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.Build.0 = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.DebugRemote|Any CPU.ActiveCfg = DebugRemote|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.DebugRemote|Any CPU.Build.0 = DebugRemote|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Tools/KTDReaderGUI/KTDReaderGUI/KTDReaderGUI.csproj b/Tools/KTDReaderGUI/KTDReaderGUI/KTDReaderGUI.csproj index 0d4723f6a..1cf96c8e8 100644 --- a/Tools/KTDReaderGUI/KTDReaderGUI/KTDReaderGUI.csproj +++ b/Tools/KTDReaderGUI/KTDReaderGUI/KTDReaderGUI.csproj @@ -94,5 +94,23 @@ + + + {9bab16de-e284-4b57-bd09-763fc5ce521a} + BeWo.Styles + + + {d5e53b0f-bf5a-41e8-93e2-0f32845fc729} + Controls + + + {47331732-DD96-4075-869F-83AA9F3F9937} + Dakota + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + + \ No newline at end of file diff --git a/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml b/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml index c1ec12b09..2e150d3e6 100644 --- a/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml +++ b/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml @@ -1,27 +1,95 @@ - + + + + + + + + + - - - + + + - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml.cs b/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml.cs index 72cb53039..e3044ef5c 100644 --- a/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml.cs +++ b/Tools/KTDReaderGUI/KTDReaderGUI/MainWindow.xaml.cs @@ -1,5 +1,7 @@ -using System; +using Dakota.Logic; +using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -20,9 +22,33 @@ namespace KTDReaderGUI /// public partial class MainWindow : Window { + private DakotaKTDReader Reader; + public MainWindow() { InitializeComponent(); + + var root = Directory.GetCurrentDirectory(); + + var path = System.IO.Path.Combine(root, "KTDatei"); + + Reader = new DakotaKTDReader(path); + } + + private void Button_Click(object sender, RoutedEventArgs e) + { + var ikkrankenkasse = input_krankenkasse.Text; + var leistungsgruppe = input_leistungsgruppe.Text; + + if (ikkrankenkasse.Length != 10 || leistungsgruppe.Length != 7) + return; + + var rtn = Reader.Resolve(ikkrankenkasse, leistungsgruppe.Substring(0, 2), leistungsgruppe.Substring(2, 5)); + + out_ikkrankenkasse.Text = rtn.Item3; + out_ikkostentrager.Text = rtn.Item2; + out_ikdatenannahmestelle.Text = rtn.Item1; + out_bezdatenannahmestelle.Text = rtn.Item4; } } }