From 932be48c24a7c28c99042bf457b115a2499a1577 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 7 Dec 2023 09:32:36 +0100 Subject: [PATCH] Fixed counting of message classes --- bsmd.database/DBManager.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs index 37ffa73f..b13f2a8e 100644 --- a/bsmd.database/DBManager.cs +++ b/bsmd.database/DBManager.cs @@ -1526,11 +1526,12 @@ namespace bsmd.database if (core == null) return; using (SqlCommand cmd = new SqlCommand()) { - cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; + // count all message classes except VISIT, TRANSIT and STO + cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND (MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass != 28)"; cmd.Parameters.AddWithValue("@ID", core.Id); int total = this.PerformReadIntQuery(cmd) ?? 0; - cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; // compare "CONFIRMED" + cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND (MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass != 28)"; // compare "CONFIRMED" int sent = this.PerformReadIntQuery(cmd) ?? 0; core.NumberSentDisplay = string.Format("{0}/{1}", sent, total);