diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index f90c09a7b..54c9676bc 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.186 + 2.0.1.187 true publish.htm false true - 187 + 188 2.0.1.%2a false true @@ -1512,7 +1512,7 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile MSBuild:Compile @@ -2037,8 +2037,8 @@ ServiceRecordView2.xaml - - ServicesReportView.xaml + + ServicesReportViewAlt.xaml ViewMailView.xaml diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 358813904..b7427ad98 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -186,6 +186,7 @@ namespace BeWo bool isServiceRecordNoticeMandatory = true; bool isPasswordSecurityActiv = false; bool showServiceRecordsDistanceFields = false; + bool showBetrag = false; bool showHilfeplanBezeichnung = false; bool showArbeitszeiten = false; bool showCustomerDistanceFields = false; @@ -313,6 +314,12 @@ namespace BeWo showServiceRecordsDistanceFields = true; } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowBetrag"); + if (val != null && val.Equals("1")) + { + showBetrag = true; + } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowHilfeplanBezeichnung"); if (val != null && val.Equals("1")) { @@ -486,6 +493,7 @@ namespace BeWo AppSettings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert; AppSettings.TimeRecordingMenuName = timeRecordingMenuName; AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields; + AppSettings.ShowBetrag = showBetrag; AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung; AppSettings.ShowArbeitszeiten = showArbeitszeiten; AppSettings.ShowSignatures = showSignatures; @@ -538,9 +546,9 @@ namespace BeWo //{ // url += "/service45"; //} - if (url.IndexOf("/servicesbd") < 0) + if (url.IndexOf("/service") < 0) { - url += "/servicesbd"; + url += "/service"; } return new Uri(String.Format("https://{0}", url)); diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 90f7c997f..af5de27b2 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1305,8 +1305,8 @@ namespace BeWo.Core UpdateSearchViewObjectList(fls2.customerSearchView, updatedCustomer); } - var serv2 = serv as ServicesReportView; - if(serv != null) + var serv2 = serv as ServicesReportViewAlt; + if(serv2 != null) { if(serv2.Customer != null) { @@ -1371,7 +1371,7 @@ namespace BeWo.Core UpdateSearchViewObjectList(fls2.employeeSearchView, updatedEmployee); } - if(serv is ServicesReportView serv2) + if(serv is ServicesReportViewAlt serv2) { if(serv2.Employee != null) { @@ -1390,7 +1390,7 @@ namespace BeWo.Core var updatedOrganisation = new CompactOrganisationDC(); ServiceFacade.DoCustomerServiceSync(s => updatedOrganisation = s.LoadOrganisationCompact((pUpdatedObject as CompactOrganisationDC).OrganisationOid)); - if(serv is ServicesReportView serv2) + if(serv is ServicesReportViewAlt serv2) { if(serv2.Organisation != null) { diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 697fe98f4..814287163 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -315,6 +315,8 @@ namespace BeWo.Core.Config public bool ShowDistanceFields { get; set; } + public bool ShowBetrag { get; set; } + public bool ShowHilfeplanBezeichnung { get; set; } public bool ShowArbeitszeiten { get; set; } diff --git a/BeWo/View/Detail/Report/ServicesReportView.xaml b/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml similarity index 98% rename from BeWo/View/Detail/Report/ServicesReportView.xaml rename to BeWo/View/Detail/Report/ServicesReportViewAlt.xaml index e62b24960..ca5556dbd 100644 --- a/BeWo/View/Detail/Report/ServicesReportView.xaml +++ b/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml @@ -1,200 +1,200 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -