diff --git a/.gitignore b/.gitignore index bf8eacc27..1c84636d2 100644 --- a/.gitignore +++ b/.gitignore @@ -192,3 +192,9 @@ /ReportImp/FortschritteEV/obj /ReportImp/LebenshilfeWetterau/bin /ReportImp/LebenshilfeWetterau/obj +/ReportImp/Socia/bin +/ReportImp/Socia/obj +/ReportImp/EigentstaendigHennef/bin +/ReportImp/EigentstaendigHennef/obj +/ReportImp/RessourceEV/bin +/ReportImp/RessourceEV/obj diff --git a/BeWo.sln b/BeWo.sln index 8d6d73616..d8e4b5af4 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}" @@ -351,6 +353,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FortschritteEV", "ReportImp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeWetterau", "ReportImp\LebenshilfeWetterau\LebenshilfeWetterau.csproj", "{19CE335D-0C77-497F-969D-3B17D8A49DFA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SociaKoeln", "ReportImp\Socia\SociaKoeln.csproj", "{80A09638-DCBC-46E9-96FA-C7070B40BF3A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EigentstaendigHennef", "ReportImp\EigentstaendigHennef\EigentstaendigHennef.csproj", "{0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RessourceEV", "ReportImp\RessourceEV\RessourceEV.csproj", "{703E37E6-1219-490D-BCBD-7258DAB4239A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -2570,19 +2578,65 @@ Global {19CE335D-0C77-497F-969D-3B17D8A49DFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {19CE335D-0C77-497F-969D-3B17D8A49DFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU {19CE335D-0C77-497F-969D-3B17D8A49DFA}.Release|x86.ActiveCfg = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|.NET.ActiveCfg = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|.NET.Build.0 = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|x86.ActiveCfg = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Debug|x86.Build.0 = Debug|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|.NET.ActiveCfg = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|.NET.Build.0 = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|Any CPU.Build.0 = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|x86.ActiveCfg = Release|Any CPU + {80A09638-DCBC-46E9-96FA-C7070B40BF3A}.Release|x86.Build.0 = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|.NET.ActiveCfg = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|.NET.Build.0 = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Debug|x86.Build.0 = Debug|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|.NET.ActiveCfg = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|.NET.Build.0 = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|Any CPU.Build.0 = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|x86.ActiveCfg = Release|Any CPU + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2}.Release|x86.Build.0 = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|.NET.ActiveCfg = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|.NET.Build.0 = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|x86.ActiveCfg = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Debug|x86.Build.0 = Debug|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|.NET.ActiveCfg = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|.NET.Build.0 = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|Any CPU.Build.0 = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|x86.ActiveCfg = Release|Any CPU + {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {3FEBB560-9275-413A-9767-BB68C44EEBC3} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} - {D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} {40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} - {663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} - {284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {6556CD8E-1142-4B3C-A17E-082C44CAB0C1} = {D8A691C5-146D-4613-86CC-438F02FE9106} {4A7C1019-4AAC-48D3-B445-2AADF8B76303} = {D8A691C5-146D-4613-86CC-438F02FE9106} {36E7D251-2F15-4589-81C2-6BDDC67F16AE} = {D8A691C5-146D-4613-86CC-438F02FE9106} @@ -2717,10 +2771,12 @@ Global {EAD43B9B-A117-4ED1-993C-D969F70DC911} = {D8A691C5-146D-4613-86CC-438F02FE9106} {012458B9-D7EF-4A7F-841B-0DD5EE9DBA90} = {D8A691C5-146D-4613-86CC-438F02FE9106} {AC208F3D-2D64-49A8-A6EB-2EE49BABF3CA} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {A10D7313-870C-4470-92EA-CD531D78C40B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {A182A40F-16C4-4890-BD4C-336CB5B8F70D} = {D8A691C5-146D-4613-86CC-438F02FE9106} {2E4CFE97-3A0B-4170-95B1-D7EE0CA7DCAA} = {D8A691C5-146D-4613-86CC-438F02FE9106} {1F5D8784-4912-4D71-867F-ADE6D56C31BD} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {4E27E4D3-C184-4E10-AE73-7600D95FCE8E} = {D8A691C5-146D-4613-86CC-438F02FE9106} {B40CB768-8847-4D73-8AC6-EED34B6216CE} = {D8A691C5-146D-4613-86CC-438F02FE9106} {697CF63E-B065-491A-AEA7-909F01ECA6AB} = {D8A691C5-146D-4613-86CC-438F02FE9106} @@ -2741,5 +2797,8 @@ Global {3FEB9C4A-BB7C-48DD-A7AE-BC9D5D00E466} = {D8A691C5-146D-4613-86CC-438F02FE9106} {B8AD320F-947F-4A5A-9787-348B0443A572} = {D8A691C5-146D-4613-86CC-438F02FE9106} {19CE335D-0C77-497F-969D-3B17D8A49DFA} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {80A09638-DCBC-46E9-96FA-C7070B40BF3A} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {703E37E6-1219-490D-BCBD-7258DAB4239A} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection EndGlobal diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 3f379fcff..a61f200c2 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -200,6 +200,7 @@ namespace BeWo bool isZeiterfassDateNormal = false; bool isZeiterfassungInStdMin = false; int lastSelectedStundenkontoIntervall = 3; + bool showSignatures = false; AppSettings.ShowAdvisedAttendedFlag = false; String timeRecordingMenuName = "Zeiterfassung"; @@ -350,7 +351,13 @@ namespace BeWo hideServiceRecordInsertedByAndInsertedOn = true; } - switch (_Mandator.BeWoClientType) + val = GetSettingValue(_Mandator.Settings, "ShowSignature"); + if (val != null && val.Equals("1")) + { + showSignatures = true; + } + + switch (_Mandator.BeWoClientType) { case 1: //Die Kette @@ -411,6 +418,7 @@ namespace BeWo AppSettings.AnzTageZeiterfassErfolgt = anzTageZeiterfassErfolgt; AppSettings.TimeRecordingMenuName = timeRecordingMenuName; AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields; + AppSettings.ShowSignatures = showSignatures; AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields; AppSettings.ShowAdditionalService = showAdditionalService; AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis; @@ -434,8 +442,7 @@ namespace BeWo String url = ServerAddress.ToLower(); #if DEBUG - //url = String.Format("http://localhost/Host"); - url = String.Format("http://localhost:3777/Host"); + url = String.Format("http://localhost/Host"); //url = String.Format("app1.bewoplaner.de/service"); #endif diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 179101133..b5a77363e 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1553,25 +1553,6 @@ namespace BeWo.Core } } - - //if (vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitEndDatum) - //{ - - // if (vm.EndTime.Value.Day != vm.DateAndTime.Value.Day) - // { - // dc.End = vm.EndTime.Value; - // } - // else - // { - // dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.DurationSTD)); - // } - //} - //else - //{ - // dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.Duration)); // --> das muss doch reichen - //} - //############################################## - } else { @@ -1855,22 +1836,22 @@ namespace BeWo.Core } //passwortlänge - if (paswd.Length >= 6 && paswd.Length < 9) + if (paswd.Length >= 4 && paswd.Length < 7) { punkte += 1; } - if (paswd.Length >= 9 && paswd.Length < 12) + if (paswd.Length >= 7 && paswd.Length < 10) { punkte += 2; } - if (paswd.Length >= 12 && paswd.Length < 18) + if (paswd.Length >= 10 && paswd.Length < 16) { punkte += 3; } - if (paswd.Length >= 18) + if (paswd.Length >= 16) { punkte += 4; } diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 93f847ae1..06f13894d 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -294,7 +294,9 @@ namespace BeWo.Core.Config public bool ShowDistanceFields { get; set; } - public bool ShowTeamNews { get; set; } + public bool ShowSignatures { get; set; } + + public bool ShowTeamNews { get; set; } public bool ShowMarker { get; set; } diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml index 46434edc9..c054f6f36 100644 --- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml +++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml @@ -201,15 +201,15 @@