diff --git a/ENI2/App.config b/ENI2/App.config index 78004935..4c7c4bc1 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -1,18 +1,18 @@ - + -
+
-
+
- - + + @@ -26,56 +26,28 @@ 1000 - http://192.168.2.24/LockingService/LockingService.svc + http://192.168.2.24/LockingService/LockingService.svc - Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ENI2/Controls/ValueMappingsControl.xaml.cs b/ENI2/Controls/ValueMappingsControl.xaml.cs index 5aeec6c4..27e8aadd 100644 --- a/ENI2/Controls/ValueMappingsControl.xaml.cs +++ b/ENI2/Controls/ValueMappingsControl.xaml.cs @@ -69,16 +69,22 @@ namespace ENI2.Controls private async void DelItem_Click(object sender, RoutedEventArgs e) { - if (this.dataGridValueMappings.SelectedItem is ValueMapping vm) + if (this.dataGridValueMappings.SelectedItems.Count > 0) { - if (MessageBox.Show($"Are you sure to delete {vm.Key} -> {vm.Value}?", Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == - MessageBoxResult.Yes) + if (MessageBox.Show($"Are you sure to delete the selected values?", Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == + MessageBoxResult.Yes) { - int result = await DBManagerAsync.DeleteAsync(vm); - if (result == 1) + var selectedItems = new List(); + foreach(ValueMapping vm in this.dataGridValueMappings.SelectedItems) + selectedItems.Add(vm); + foreach(ValueMapping vm in selectedItems) { - _mappings.Remove(vm); - } + int result = await DBManagerAsync.DeleteAsync(vm); + if (result == 1) + { + _mappings.Remove(vm); + } + } } } } diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index d4077002..520cf02e 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -18,7 +18,7 @@ - ENI2.publish\ + eni2.publish\ true Web true @@ -36,8 +36,8 @@ 5.4.0.0 true publish.html - 7 - 7.2.7.7 + 1 + 7.2.8.1 false true true @@ -140,61 +140,61 @@ packages\log4net.3.0.4\lib\net462\log4net.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.9.0.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.DependencyInjection.dll + + packages\Microsoft.Extensions.DependencyInjection.9.0.4\lib\net462\Microsoft.Extensions.DependencyInjection.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.4\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Logging.dll + + packages\Microsoft.Extensions.Logging.9.0.4\lib\net462\Microsoft.Extensions.Logging.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Logging.Abstractions.dll + + packages\Microsoft.Extensions.Logging.Abstractions.9.0.4\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Options.dll + + packages\Microsoft.Extensions.Options.9.0.4\lib\net462\Microsoft.Extensions.Options.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Primitives.dll + + packages\Microsoft.Extensions.Primitives.9.0.4\lib\net462\Microsoft.Extensions.Primitives.dll packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll True - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\MigraDoc.DocumentObjectModel.dll + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\MigraDoc.Rendering-gdi.dll + + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\MigraDoc.Rendering.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\MigraDoc.RtfRendering-gdi.dll + + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\MigraDoc.RtfRendering.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp-gdi.dll + + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\PdfSharp.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.Charting-gdi.dll + + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\PdfSharp.Charting.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.Quality-gdi.dll + + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\PdfSharp.Quality.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.Snippets-gdi.dll + + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\PdfSharp.Snippets.dll - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.System.dll + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\PdfSharp.System.dll - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.WPFonts.dll + packages\PDFsharp-MigraDoc.6.1.1\lib\netstandard2.0\PdfSharp.WPFonts.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Buffers.dll + + packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll @@ -202,30 +202,27 @@ packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Diagnostics.DiagnosticSource.dll + + packages\System.Diagnostics.DiagnosticSource.9.0.4\lib\net462\System.Diagnostics.DiagnosticSource.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Memory.dll + + packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Numerics.Vectors.dll + + packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Threading.Tasks.Extensions.dll - - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.ValueTuple.dll + + packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll @@ -242,19 +239,19 @@ - packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.dll + packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.dll - packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.Toolkit.dll + packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.Toolkit.dll @@ -914,10 +911,6 @@ Settings.settings True - - Report\Logo.gif - PreserveNewest - report.db PreserveNewest @@ -1025,7 +1018,9 @@ - + + PreserveNewest + Always @@ -1182,7 +1177,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + - - - - diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml index 02ab6d57..85d655fb 100644 --- a/ENI2/MainWindow.xaml +++ b/ENI2/MainWindow.xaml @@ -10,9 +10,9 @@ xmlns:util="clr-namespace:ENI2.Util" xmlns:local="clr-namespace:ENI2" mc:Ignorable="d" - Title="ENI 2" - Height="{util:SettingBinding Height}" Width="{util:SettingBinding Width}" - Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" + Title="ENI 2" + Height="{util:SettingBinding Height}" Width="{util:SettingBinding Width}" + Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" SourceInitialized="Window_SourceInitialized"> diff --git a/ENI2/Report/Logo.png b/ENI2/Report/Logo.png new file mode 100644 index 00000000..cde2ef15 Binary files /dev/null and b/ENI2/Report/Logo.png differ diff --git a/ENI2/Report/ReportDocument.cs b/ENI2/Report/ReportDocument.cs index 5b5da75c..58cbaf62 100644 --- a/ENI2/Report/ReportDocument.cs +++ b/ENI2/Report/ReportDocument.cs @@ -254,7 +254,7 @@ namespace ENI2.Report table.AddColumn(140); Row row = table.AddRow(); - Image logoImage = row.Cells[0].AddImage(@"Report\Logo.gif"); // kann man offenbar nur von einem Pfad laden + Image logoImage = row.Cells[0].AddImage(@"Report\Logo.png"); // kann man offenbar nur von einem Pfad laden logoImage.Width = 80; row.Cells[0].MergeDown = 6; diff --git a/ENI2/Resources/Logo.png b/ENI2/Resources/Logo.png new file mode 100644 index 00000000..cde2ef15 Binary files /dev/null and b/ENI2/Resources/Logo.png differ diff --git a/ENI2/packages.config b/ENI2/packages.config index 05eea6b5..14b54d2b 100644 --- a/ENI2/packages.config +++ b/ENI2/packages.config @@ -1,24 +1,24 @@  - + - - - - - - - + + + + + + + - + - + - - - - - - + + + + + + \ No newline at end of file diff --git a/bsmd.LockingService/bsmd.LockingService.csproj.user b/bsmd.LockingService/bsmd.LockingService.csproj.user index 6c90db82..3517ad61 100644 --- a/bsmd.LockingService/bsmd.LockingService.csproj.user +++ b/bsmd.LockingService/bsmd.LockingService.csproj.user @@ -1,4 +1,4 @@ - + true diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs index 5dd3993f..992ffe9a 100644 --- a/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("7.2.7")] +[assembly: AssemblyInformationalVersion("7.2.8")] [assembly: AssemblyCopyright("Copyright © 2014-2025 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs index 8d326253..cf4fdec9 100644 --- a/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("7.2.7.*")] +[assembly: AssemblyVersion("7.2.8.*")] diff --git a/misc/db.sqlite b/misc/db.sqlite index 2b477aca..529f4f1a 100644 Binary files a/misc/db.sqlite and b/misc/db.sqlite differ