From c64ae501acb2de84ce7a8633fcf8c00a05d8e5b7 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 11 Jun 2017 11:08:18 +0000 Subject: [PATCH] 3.6.4.0 Neue ENI-2 Version (Locking und einen Haufen Kleinigkeiten) --- ENI-2/ENI2/ENI2/App.config | 3 ++- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 6 +++++- .../OverViewDetailControl.xaml.cs | 11 ++++++++++- ENI-2/ENI2/ENI2/ENI2.csproj | 4 ++-- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 9 ++++++--- Stundensheet.xlsx | Bin 30919 -> 30963 bytes .../bsmd.LockingService.csproj | 1 + .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 9 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 6243d275..caaa686d 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -27,7 +27,8 @@ 60 - Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index 2a24188f..01eec230 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -9,7 +9,6 @@ using System.Windows.Controls; using bsmd.database; using ENI2.DetailViewControls; -using ENI2.LockingServiceReference; using System.Windows; using System.Windows.Data; @@ -38,6 +37,8 @@ namespace ENI2 public bool LockedByOtherUser { get; set; } + public ReportingParty LockedBy { get; set; } + #endregion #region Construction @@ -119,6 +120,9 @@ namespace ENI2 detailControl.Initialize(); detailControl.IsEnabled = !this.LockedByOtherUser; + if (!detailControl.IsEnabled && (detailControl is OverViewDetailControl)) + ((OverViewDetailControl)detailControl).ShowLockedBy(this.LockedBy); + controlCache.Add(mg.MessageGroupControlType, detailControl); this.buttonSave.Visibility = Visibility.Hidden; } diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs index 93cbeba3..ea8d0c34 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs @@ -292,6 +292,16 @@ namespace ENI2.DetailViewControls #endregion + #region public methods + + public void ShowLockedBy(ReportingParty reportingParty) + { + this.stackPanelLock.Visibility = Visibility.Visible; + this.textBlockLockUserName.Text = reportingParty.FirstName + " " + reportingParty.LastName; + } + + #endregion + #region private methods private void jumpToMessage(Message message) @@ -441,6 +451,5 @@ namespace ENI2.DetailViewControls #endregion - } } diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index f444e9d0..4dc6a63f 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -35,8 +35,8 @@ 3.5.1.0 true publish.html - 2 - 3.6.3.%2a + 1 + 3.6.4.%2a false true true diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs index 246a3b88..c3d63696 100644 --- a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs +++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs @@ -82,14 +82,17 @@ namespace ENI2 // TODO: wenn der Locking Service nicht erreichbar ist sollte das Ganze trotzdem noch irgendwie funktionieren _log.ErrorFormat("LockingService.Lock: {0}", ex.Message); } - bool iDidLockIt = (lockedUserId == Guid.Empty); + bool iDidLockIt = (lockedUserId == Guid.Empty); searchResultItem.TabClosing += SearchResultItem_TabClosing; DateTime? eta = aMessageCore.IsTransit ? aMessageCore.ETAKielCanal : aMessageCore.ETA; searchResultItem.SetHeaderText(string.Format("{0} [{1}-{2}]", aMessageCore.Shipname, aMessageCore.PoC, eta.HasValue ? eta.Value.ToShortDateString() : ""), iDidLockIt); + DetailRootControl drc = new DetailRootControl(aMessageCore); - drc.LockedByOtherUser = !iDidLockIt; + drc.LockedByOtherUser = !iDidLockIt; + drc.LockedBy = iDidLockIt ? this.userEntity : DBManager.Instance.GetReportingPartyDict()[lockedUserId]; + searchResultItem.Content = drc; this.mainFrame.Items.Add(searchResultItem); Dispatcher.BeginInvoke((Action)(() => this.mainFrame.SelectedIndex = (this.mainFrame.Items.Count - 1))); @@ -140,7 +143,7 @@ namespace ENI2 private void Window_Loaded(object sender, RoutedEventArgs e) { - if (Debugger.IsAttached) this.busyIndicator.IsBusy = false; // not for me :-P + // if (Debugger.IsAttached) this.busyIndicator.IsBusy = false; // not for me :-P this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString); labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed"; diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 9227f55bc8987c4c611e13e21e15ad3ff6d5be1e..33b8a3b2106e7c6a2e370ed223a497ee2d0ab763 100644 GIT binary patch delta 14372 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 dMFIE84Ud0n{{t#dn_2(> delta 14304 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 Nzf&X7x&5d1e*mkcjwt{D diff --git a/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj b/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj index e965eeae..866a08e7 100644 --- a/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj +++ b/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj @@ -99,6 +99,7 @@ bsmdKey.snk + Web.config diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 9e610749..7f47bdd2 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.6.3")] +[assembly: AssemblyInformationalVersion("3.6.4")] [assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 00bcc77b..4818bbde 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.6.3.*")] +[assembly: AssemblyVersion("3.6.4.*")]