diff --git a/BeWo.sln b/BeWo.sln index add78c651..bb2aa1d12 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -561,6 +561,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForumEV", "ReportImp\ForumE EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BzhEssenGGmbH", "ReportImp\BzhEssenGGmbH\BzhEssenGGmbH.csproj", "{284983D5-2982-4A96-87B9-AEE265393D75}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChristianWilke", "ReportImp\ChristianWilke\ChristianWilke.csproj", "{0814AFF5-295C-457A-9741-2BE309E9D437}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4436,6 +4438,22 @@ Global {284983D5-2982-4A96-87B9-AEE265393D75}.Release|Mixed Platforms.Build.0 = Release|Any CPU {284983D5-2982-4A96-87B9-AEE265393D75}.Release|x86.ActiveCfg = Release|Any CPU {284983D5-2982-4A96-87B9-AEE265393D75}.Release|x86.Build.0 = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|.NET.ActiveCfg = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|.NET.Build.0 = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|x86.ActiveCfg = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Debug|x86.Build.0 = Debug|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|.NET.ActiveCfg = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|.NET.Build.0 = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|Any CPU.Build.0 = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|x86.ActiveCfg = Release|Any CPU + {0814AFF5-295C-457A-9741-2BE309E9D437}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4712,6 +4730,7 @@ Global {F38B83C7-A8EF-48EA-8B5B-9395174AA8AF} = {D8A691C5-146D-4613-86CC-438F02FE9106} {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {284983D5-2982-4A96-87B9-AEE265393D75} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {0814AFF5-295C-457A-9741-2BE309E9D437} = {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 4a61fae4f..7d13b2a6b 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -29,31 +29,6 @@ 3.5 - D:\Projects\beyondsoft\BeWoPlaner\Publish\ - true - Web - true - Foreground - 7 - Days - false - true - false - http://app.beyondsoft.de/ - de-DE - BeWoPlaner - beyondSoft GmbH - 2.0.1.217 - true - publish.htm - false - true - 218 - 2.0.1.%2a - false - true - true - true true diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 171fc3671..132b5415a 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,9 +2,9 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\ - http://app.beyondsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/ + http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|https://app.ownsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/ - + https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/ de-DE diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 3df89c1a5..17c4653db 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -48,8 +48,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.10"; - public static string Version = "Version 3.10"; + public static string ShortVersion = "3.11"; + public static string Version = "Version 3.11"; public static int RenderTier = 0; diff --git a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs index 2b8854707..bb11a377c 100644 --- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs +++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs @@ -28,6 +28,7 @@ namespace BeWo.View.Detail { public partial class AccountingTransactionBookingView { + private bool saveInProgress = false; public static Visibility InsertedOnAndByVisibility { get @@ -191,8 +192,11 @@ namespace BeWo.View.Detail accountingTransactionGrid.SelectedItem = vm; } + protected override void Save() { + saveInProgress = true; + var lToDos = new List>(); if (ViewModel.AddedCount > 0) @@ -203,7 +207,13 @@ namespace BeWo.View.Detail var oids = s.InsertNewAccountingTransactions(ViewModel.CommitAdded()); var idx = 0; - foreach (var vm in ViewModel.AccountingTransactionVMList.Where(vm => vm.IsNew)) + var newVms = ViewModel.AccountingTransactionVMList.Where(vm => vm.IsNew); + + if (newVms.Count() != oids.Count) + { + int test = 0; + } + foreach (var vm in newVms) { vm.IsNew = false; vm.DataContract.AccountingTransactionVersion = 1; @@ -378,6 +388,7 @@ namespace BeWo.View.Detail { ViewModel.PrototypeVM.Amount = null; ViewModel.PrototypeVM.Notice = string.Empty; + saveInProgress = false; } private void SelectedItemChanged(FlatSupportConceptTreeNodeDC selectedNode) @@ -445,6 +456,10 @@ namespace BeWo.View.Detail private void button_add_Click(object sender, RoutedEventArgs e) { + if (saveInProgress) + { + return; + } var lValid = ValidationTrigger.Validate(rootGrid); if (lValid) @@ -464,6 +479,7 @@ namespace BeWo.View.Detail ViewModel.AccountingTransactionVMList.Add(atvm); + Save(); ViewModel.RefreshAccountingTransactionsForSelectedTreeNode(); } diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml index 6a0f0a042..890c47dfd 100644 --- a/BeWo/View/Detail/EmployeeView.xaml +++ b/BeWo/View/Detail/EmployeeView.xaml @@ -469,8 +469,8 @@ - - + + diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs index d5e9dc236..60d57298d 100644 --- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs +++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs @@ -714,7 +714,7 @@ namespace BeWo.View.Detail.Report public FlexibleReportEntryType Type { get; set; } - public int? Kilometer { get; set; } + public decimal? Kilometer { get; set; } public decimal? Betrag { get; set; } diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml index 3900e01a2..9da3bf94b 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml +++ b/BeWo/View/Detail/SupportConceptView.xaml @@ -88,10 +88,10 @@ - - - - + + + + Drucken diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 077a9a938..7449f6657 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -1626,30 +1626,6 @@ namespace BeWo.View.Detail return newVm; } - private void LinkPrintRating_OnRequestNavigate(object sender, RequestNavigateEventArgs e) - { - var link = sender as Hyperlink; - if (link != null) - { - var rating = link.Tag as RatingVM; - - if (rating != null) - { - var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" - + "?scOid=" + this.ViewModel.DataContract.SupportConceptOid ?? 0 - + "rOid=" + rating.DataContract.RatingOid ?? 0 - + "&type=" + Utils.EnumName(ReportTypes.RatingReport); - url = BeWoWpfUtils.GetHTMLEncodedURL(url); - - link.NavigateUri = new Uri(url); - BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Bewertung")); - } - } - - - - //System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString())); - } private void BtnDeleteRating_Click(object sender, RoutedEventArgs e) { @@ -1918,6 +1894,29 @@ namespace BeWo.View.Detail } + + + private void linkPdfExport_Click(object sender, RoutedEventArgs e) + { + var link = sender as Hyperlink; + if (link != null) + { + var rating = link.Tag as RatingVM; + + if (rating != null && rating.DataContract.RatingOid.HasValue) + { + var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" + + "?scOid=" + (this.ViewModel.DataContract.SupportConceptOid ?? 0) + + "&rOid=" + (rating.DataContract.RatingOid ?? 0) + + "&type=" + Utils.EnumName(ReportTypes.RatingReport); + url = BeWoWpfUtils.GetHTMLEncodedURL(url); + + link.NavigateUri = new Uri(url); + BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Bewertung")); + } + } + + } } public class ValueListEntryTypeToColorConverter : IValueConverter diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml index b901ade59..b93165d4c 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml @@ -288,8 +288,8 @@