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

Warndialog veränderte Meldeklassen (5.7), Vorgriff

Browse Source
This commit is contained in:
Daniel Schick 2019-09-23 06:09:45 +00:00
parent c6284eb06c
commit 4647eab8ad
7 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
View File

@ -65,16 +65,19 @@ namespace ENI2
// wenn in einer Meldeklasse zwar Daten vorhanden sind, eingespielt durch Excel import oder
// Handeingabe, diese aber NICHT gesendet wurden.
// TODO: Hier wird noch ein Flag benötigt, dass die erfolgte Anzeige des Warndialogs speichert
/*
foreach (Message aMessage in _messages)
{
if ((aMessage.InternalStatus == Message.BSMDStatus.UPDATED) ||
if (((aMessage.InternalStatus == Message.BSMDStatus.UPDATED) ||
(aMessage.InternalStatus == Message.BSMDStatus.SAVED) ||
(aMessage.InternalStatus == Message.BSMDStatus.EXCEL))
(aMessage.InternalStatus == Message.BSMDStatus.EXCEL)) &&
!aMessage.UnsentMessageWarningShown)
{
aMessage.UnsentMessageWarningShown = true;
return true;
}
}
*/
return false;
}
}
@ -432,6 +435,7 @@ namespace ENI2
message.SaveElements();
message.IsDirty = false;
message.UnsentMessageWarningShown = false;
if(message.MessageNotificationClass == Message.NotificationClass.ATA)
{

BIN
Stundensheet.xlsx
View File

Binary file not shown.

5
nsw/Source/SQL/Update_5.6_To_5.7.sql Normal file
View File

@ -0,0 +1,5 @@
PRINT N'Altering [dbo].[MessageHeader]...';
GO
ALTER TABLE [dbo].[MessageHeader] ADD [Flags] INT NULL;
GO

1
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -137,6 +137,7 @@ namespace bsmd.ExcelReadService
{
message.CreatedBy = "EXCEL";
message.InternalStatus = Message.BSMDStatus.EXCEL;
message.UnsentMessageWarningShown = false;
DBManager.Instance.Save(message);
message.SaveElements();
}

33
nsw/Source/bsmd.database/Message.cs
View File

@ -187,6 +187,14 @@ namespace bsmd.database
DUDR_TEST
}
// Late to the party: generic flags Enum/Field
public enum MessageFlags : int
{
UNSENT_WARNING_SHOWN = 1
}
#endregion
#region Construction
@ -373,6 +381,17 @@ namespace bsmd.database
/// </summary>
public bool? SendSuccess { get; set; }
public bool UnsentMessageWarningShown
{
get { return this.IsFlagSet(MessageFlags.UNSENT_WARNING_SHOWN); }
set { this.SetFlag(value, MessageFlags.UNSENT_WARNING_SHOWN); }
}
/// <summary>
/// Speicher-Int für generische Flags
/// </summary>
public int Flags { get; set; }
#endregion
#region IDatabaseEntity implementation
@ -862,5 +881,19 @@ namespace bsmd.database
#endregion
#region private methods
private bool IsFlagSet(MessageFlags flag)
{
return (this.Flags & (int)flag) != 0;
}
private void SetFlag(bool value, MessageFlags flag)
{
if (value) this.Flags |= (int)flag;
else this.Flags &= (int)~flag;
}
#endregion
}
}

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("5.6.0")]
[assembly: AssemblyInformationalVersion("5.7.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2019 schick Informatik")]
[assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("5.6.0.*")]
[assembly: AssemblyVersion("5.7.0.*")]