From fa5d03ef5237b1f7e68eb7e71008cba676ef0a26 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Thu, 23 Aug 2018 10:26:50 -0600 Subject: [PATCH] Fixed sort logic for issue #145 --- GBM/Forms/frmSessions.vb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/GBM/Forms/frmSessions.vb b/GBM/Forms/frmSessions.vb index e5665c9..b329c60 100644 --- a/GBM/Forms/frmSessions.vb +++ b/GBM/Forms/frmSessions.vb @@ -290,9 +290,21 @@ Public Class frmSessions Select Case iDataTypeCol Case iDataType.DecimalType - iCompareResult = If(CDec(dgRow1.Cells(iSortCol).Value) < CDec(dgRow2.Cells(iSortCol).Value), -1, 1) + If (CDec(dgRow1.Cells(iSortCol).Value) = CDec(dgRow2.Cells(iSortCol).Value)) Then + iCompareResult = 0 + ElseIf (CDec(dgRow1.Cells(iSortCol).Value) < CDec(dgRow2.Cells(iSortCol).Value)) Then + iCompareResult = -1 + Else + iCompareResult = 1 + End If Case iDataType.IntType - iCompareResult = If(CInt(dgRow1.Cells(iSortCol).Value) < CInt(dgRow2.Cells(iSortCol).Value), -1, 1) + If (CInt(dgRow1.Cells(iSortCol).Value) = CInt(dgRow2.Cells(iSortCol).Value)) Then + iCompareResult = 0 + ElseIf (CInt(dgRow1.Cells(iSortCol).Value) < CInt(dgRow2.Cells(iSortCol).Value)) Then + iCompareResult = -1 + Else + iCompareResult = 1 + End If Case iDataType.StringType iCompareResult = String.Compare(CStr(dgRow1.Cells(iSortCol).Value), CStr(dgRow2.Cells(iSortCol).Value)) Case iDataType.DateTimeType