diff --git a/.gitignore b/.gitignore index afaacfcfc..47bf80d9d 100644 --- a/.gitignore +++ b/.gitignore @@ -535,4 +535,6 @@ /ReportImp/LebenshilfeDuisburgHPTG/obj/Debug /ReportImp/LebenshilfeDuisburgHPTG/obj/Release /ReportImp/ProIntegra/obj/Debug +/ReportImp/ZuhauseWohnenIrisThimm/obj/Debug +/ReportImp/FAMRheinSiegGbr/obj/Debug /ReportImp/ProIntegra/obj/Release diff --git a/BeWo.sln b/BeWo.sln index 4dfd401a4..9ae9770d1 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -465,6 +465,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmbulantBetreutesWohnenAstr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProIntegra", "ReportImp\ProIntegra\ProIntegra.csproj", "{7FCD3132-1656-4051-B4D8-650DEB349A61}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZuhauseWohnenIrisThimm", "ReportImp\ZuhauseWohnenIrisThimm\ZuhauseWohnenIrisThimm.csproj", "{22E7F5F8-BB34-4243-896B-221F78837F83}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FAMRheinSiegGbr", "ReportImp\FAMRheinSiegGbr\FAMRheinSiegGbr.csproj", "{88273E87-C5F9-4DBF-876A-296527A61B4A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HshCologne", "ReportImp\HshCologne\HshCologne.csproj", "{B9962DC8-015C-415A-A079-94BC3279E577}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3572,6 +3578,54 @@ Global {7FCD3132-1656-4051-B4D8-650DEB349A61}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7FCD3132-1656-4051-B4D8-650DEB349A61}.Release|x86.ActiveCfg = Release|Any CPU {7FCD3132-1656-4051-B4D8-650DEB349A61}.Release|x86.Build.0 = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|.NET.ActiveCfg = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|.NET.Build.0 = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|x86.ActiveCfg = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Debug|x86.Build.0 = Debug|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|.NET.ActiveCfg = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|.NET.Build.0 = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|Any CPU.Build.0 = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|x86.ActiveCfg = Release|Any CPU + {22E7F5F8-BB34-4243-896B-221F78837F83}.Release|x86.Build.0 = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|.NET.ActiveCfg = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|.NET.Build.0 = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|x86.ActiveCfg = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|x86.Build.0 = Debug|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|.NET.ActiveCfg = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|.NET.Build.0 = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Any CPU.Build.0 = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|x86.ActiveCfg = Release|Any CPU + {88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|x86.Build.0 = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|.NET.ActiveCfg = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|.NET.Build.0 = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|x86.ActiveCfg = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Debug|x86.Build.0 = Debug|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|.NET.ActiveCfg = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|.NET.Build.0 = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|Any CPU.Build.0 = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|x86.ActiveCfg = Release|Any CPU + {B9962DC8-015C-415A-A079-94BC3279E577}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3800,6 +3854,9 @@ Global {5C99CC38-15A8-4485-8D59-997EEEA9D6C1} = {D8A691C5-146D-4613-86CC-438F02FE9106} {6AB16005-E552-4619-9E55-D752FCCAC3B0} = {D8A691C5-146D-4613-86CC-438F02FE9106} {7FCD3132-1656-4051-B4D8-650DEB349A61} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {22E7F5F8-BB34-4243-896B-221F78837F83} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {88273E87-C5F9-4DBF-876A-296527A61B4A} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {B9962DC8-015C-415A-A079-94BC3279E577} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 32b32f23d..1dd9d8e06 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -320,6 +320,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -1032,6 +1036,9 @@ InformationView.xaml + + DateiBearbeiten.xaml + UrlaubstagSchenkenView.xaml @@ -2493,392 +2500,392 @@ False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly diff --git a/BeWo/View/Detail/DateiBearbeiten.xaml b/BeWo/View/Detail/DateiBearbeiten.xaml new file mode 100644 index 000000000..aafb3b335 --- /dev/null +++ b/BeWo/View/Detail/DateiBearbeiten.xaml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + +