From 867146eb548a7c2e653670730b098f39ec1295e2 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sat, 30 Sep 2017 09:24:01 +0000 Subject: [PATCH] Zwischenstand Validierung (Sicherung!) --- ENI-2/ENI2/ENI2/App.config | 8 +- .../ENI2/Controls/ConditionGroupControl.xaml | 23 +++ .../Controls/ConditionGroupControl.xaml.cs | 30 +++ ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs | 26 +-- .../ArrivalNotificationDetailControl.xaml | 1 + .../BorderPoliceDetailControl.xaml | 9 +- .../BorderPoliceDetailControl.xaml.cs | 186 +++++++++-------- .../DangerousGoodsDetailControl.xaml | 10 +- .../DepartureNotificationDetailControl.xaml | 3 +- ...aritimeHealthDeclarationDetailControl.xaml | 15 +- .../OverViewDetailControl.xaml | 14 ++ .../OverViewDetailControl.xaml.cs | 4 + .../PortCallDetailControl.xaml | 1 + .../PortNotificationDetailControl.xaml | 2 + .../SecurityDetailControl.xaml | 2 + .../TowageDetailControl.xaml | 2 + .../WasteDetailControl.xaml | 1 + ENI-2/ENI2/ENI2/ENI2.csproj | 13 +- .../ENI2/EditControls/EditRulesDialog.xaml | 42 +++- .../ENI2/EditControls/EditRulesDialog.xaml.cs | 188 +++++++----------- .../ENI2/EditControls/EditTOWDialog.xaml.cs | 2 +- ENI-2/ENI2/ENI2/MainWindow.xaml | 6 +- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 60 ++---- .../ENI2/Properties/Resources.Designer.cs | 28 +++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 9 + ENI-2/ENI2/ENI2/Resources/refresh.png | Bin 0 -> 1625 bytes ENI-2/ENI2/ENI2/Util/EnumHelper.cs | 29 +++ .../ENI2/ENI2/Util/EnumToBooleanConverter.cs | 38 ++++ .../ENI2/Util/EnumToCollectionConverter.cs | 30 +++ Stundensheet.xlsx | Bin 34215 -> 34518 bytes nsw/Source/bsmd.ExcelReadService/Util.cs | 3 +- nsw/Source/bsmd.database/BKRA.cs | 4 +- nsw/Source/bsmd.database/BRKD.cs | 4 +- nsw/Source/bsmd.database/CREW.cs | 2 +- nsw/Source/bsmd.database/CallPurpose.cs | 4 +- nsw/Source/bsmd.database/Extensions.cs | 8 + nsw/Source/bsmd.database/IBCPosition.cs | 2 + nsw/Source/bsmd.database/IGCPosition.cs | 2 + nsw/Source/bsmd.database/IMDGPosition.cs | 2 + nsw/Source/bsmd.database/IMSBCPosition.cs | 2 + nsw/Source/bsmd.database/InfectedArea.cs | 3 + .../bsmd.database/MARPOL_Annex_I_Position.cs | 2 + nsw/Source/bsmd.database/Message.cs | 29 +++ nsw/Source/bsmd.database/PAS.cs | 2 +- .../bsmd.database/PortOfCallLast30Days.cs | 3 + .../PortOfCallLast30DaysCrewJoinedShip.cs | 2 + nsw/Source/bsmd.database/PortOfItinerary.cs | 2 + .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/STO.cs | 2 + .../bsmd.database/SanitaryMeasuresDetail.cs | 3 + .../bsmd.database/StowawaysJoiningLocation.cs | 3 + nsw/Source/bsmd.database/SubsidiaryRisks.cs | 2 + nsw/Source/bsmd.database/TOWA.cs | 2 + nsw/Source/bsmd.database/TOWD.cs | 2 + nsw/Source/bsmd.database/Util.cs | 11 +- .../bsmd.database/ValidationCondition.cs | 63 +++++- nsw/Source/bsmd.database/Waste.cs | 2 +- .../WasteDisposalServiceProvider.cs | 2 + nsw/Source/bsmd.database/bsmd.database.csproj | 2 + nsw/Source/bsmd.hisnord/NSWResponse.cs | 46 ++++- nsw/Source/bsmd.hisnord/Request.cs | 50 +++-- nsw/Source/bsmd.hisnord/Response.cs | 6 + 63 files changed, 746 insertions(+), 312 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml create mode 100644 ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml.cs create mode 100644 ENI-2/ENI2/ENI2/Resources/refresh.png create mode 100644 ENI-2/ENI2/ENI2/Util/EnumHelper.cs create mode 100644 ENI-2/ENI2/ENI2/Util/EnumToBooleanConverter.cs create mode 100644 ENI-2/ENI2/ENI2/Util/EnumToCollectionConverter.cs diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index f39c4f5a..2b0bf49c 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -26,12 +26,12 @@ 1000 - http://192.168.2.4/LockingService/LockingService.svc - + + http://heupferd/bsmd.LockingService/LockingService.svc - Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False - + + Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False diff --git a/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml b/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml new file mode 100644 index 00000000..9c57870e --- /dev/null +++ b/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml.cs new file mode 100644 index 00000000..0d630dd8 --- /dev/null +++ b/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml.cs @@ -0,0 +1,30 @@ +// Copyright (c) 2017 schick Informatik +// Description: Plugin Control zur Auswahl der bool'schen Gruppenoperation +// + +using System.Windows; +using System.Windows.Controls; + +using bsmd.database; + +namespace ENI2.Controls +{ + /// + /// Interaction logic for ConditionGroupControl.xaml + /// + public partial class ConditionGroupControl : UserControl + { + public ConditionGroupControl() + { + InitializeComponent(); + Loaded += ConditionGroupControl_Loaded; + } + + public ConditionGroup ConditionGroup { get; set; } + + private void ConditionGroupControl_Loaded(object sender, RoutedEventArgs e) + { + this.DataContext = this.ConditionGroup; + } + } +} diff --git a/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs b/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs index 561645b5..47af50e7 100644 --- a/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs +++ b/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs @@ -3,22 +3,15 @@ // using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; using bsmd.database; using System.Windows.Controls.Primitives; +using System.Collections.Generic; namespace ENI2.Controls { @@ -171,15 +164,22 @@ namespace ENI2.Controls protected void deleteItem(object sender, RoutedEventArgs e) { - if((this.SelectedItems != null) && (this.SelectedItems.Count == 1) && !this.IsReadOnly) + if((this.SelectedItems != null) && (this.SelectedItems.Count > 0) && !this.IsReadOnly) { MessageBoxResult result = MessageBox.Show(Properties.Resources.textAreYouSure, Properties.Resources.textCaptionDeleteConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question); if (result == MessageBoxResult.Yes) { - DatabaseEntity deleteItem = this.SelectedItems[0] as DatabaseEntity; - if (deleteItem != null) { - this.DeleteRequested?.Invoke(deleteItem); - } + List deleteList = new List(); + foreach (DatabaseEntity deleteItem in this.SelectedItems) + deleteList.Add(deleteItem); + + foreach (DatabaseEntity deleteItem in deleteList) + { + if (deleteItem != null) + { + this.DeleteRequested?.Invoke(deleteItem); + } + } } } } diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml index ded673a4..080d9eea 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml @@ -68,6 +68,7 @@ + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml index be8ebd79..7f4d09b8 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml @@ -35,8 +35,9 @@