dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kleine Korrekturen nach RM Christin

Browse Source
This commit is contained in:
Daniel Schick 2022-01-08 11:17:17 +01:00
parent e728d2060c
commit 5db4e32381
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
View File

@ -18,6 +18,7 @@ using System.Windows.Media.Imaging;
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Media; using System.Windows.Media;
using Microsoft.Win32; using Microsoft.Win32;
using System.Diagnostics;
namespace ENI2.DetailViewControls namespace ENI2.DetailViewControls
{ {
@ -563,6 +564,7 @@ namespace ENI2.DetailViewControls
{ {
MessageBox.Show("Report created: " + sfd.FileName, "Success", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show("Report created: " + sfd.FileName, "Success", MessageBoxButton.OK, MessageBoxImage.Information);
// Clipboard.SetText(sfd.FileName); // Clipboard.SetText(sfd.FileName);
Process.Start(sfd.FileName);
} }
else else
{ {
@ -813,6 +815,7 @@ namespace ENI2.DetailViewControls
{ {
em.Export(sfd.FileName, this.Core, this.Messages, out string resultMessage); em.Export(sfd.FileName, this.Core, this.Messages, out string resultMessage);
MessageBox.Show("Exported " + sfd.FileName, "Export successful", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show("Exported " + sfd.FileName, "Export successful", MessageBoxButton.OK, MessageBoxImage.Information);
Process.Start(sfd.FileName);
} }
catch(Exception ex) catch(Exception ex)
{ {

2
ENI2/Excel/ExcelUtil.cs
View File

@ -906,7 +906,7 @@ namespace ENI2.Excel
if (!stat.ISMCompanyId.IsNullOrEmpty()) if (!stat.ISMCompanyId.IsNullOrEmpty())
{ {
// strip "ISM" at the beginning if it is there (27.12.21) // strip "ISM" at the beginning if it is there (27.12.21)
if (stat.ISMCompanyId.StartsWith("ism", StringComparison.OrdinalIgnoreCase)) if (stat.ISMCompanyId.StartsWith("imo", StringComparison.OrdinalIgnoreCase))
stat.ISMCompanyId = stat.ISMCompanyId.Substring(3); stat.ISMCompanyId = stat.ISMCompanyId.Substring(3);
if(stat.ISMCompanyId.Length < 7) { // zero - fill if(stat.ISMCompanyId.Length < 7) { // zero - fill

2
bsmd.database/MessageCore.cs
View File

@ -455,7 +455,7 @@ namespace bsmd.database
public override void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, params object[] criteria) public override void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
{ {
StringBuilder sb = new StringBuilder("SELECT "); StringBuilder sb = new StringBuilder("SELECT ");
if (this.ResultLimit.HasValue && this.ResultLimit.Value > 0) if (this.ResultLimit > 0)
{ {
sb.AppendFormat("TOP {0} ", this.ResultLimit); sb.AppendFormat("TOP {0} ", this.ResultLimit);
} }