This commit is contained in:
2022-02-11 14:37:18 +01:00
parent 98a1821f2b
commit 05b150f282
9 changed files with 644 additions and 58 deletions

View File

@@ -473,7 +473,7 @@ Public Class frmFlowSearch
Private Sub ToggleSwitchDate_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchCurrentYear.Toggled, ToggleSwitchLastYear.Toggled,
ToggleSwitchLastMonth.Toggled, ToggleSwitchCurrentMonth.Toggled
ToggleSwitchLastMonth.Toggled, ToggleSwitchMonth.Toggled
If TOGGLE_Change = True Then
Exit Sub
End If
@@ -486,19 +486,19 @@ Public Class frmFlowSearch
Select Case oToggle.Name
Case "ToggleSwitchCurrentYear"
ToggleSwitchLastYear.IsOn = False
ToggleSwitchCurrentMonth.IsOn = False
ToggleSwitchMonth.IsOn = False
ToggleSwitchLastMonth.IsOn = False
ToggleSwitchToday.IsOn = False
ToggleSwitchYesterday.IsOn = False
oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())")
Case "ToggleSwitchLastYear"
ToggleSwitchCurrentYear.IsOn = False
ToggleSwitchCurrentMonth.IsOn = False
ToggleSwitchMonth.IsOn = False
ToggleSwitchLastMonth.IsOn = False
ToggleSwitchToday.IsOn = False
ToggleSwitchYesterday.IsOn = False
oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)")
Case "ToggleSwitchCurrentMonth"
Case "ToggleSwitchMonth"
ToggleSwitchCurrentYear.IsOn = False
ToggleSwitchLastYear.IsOn = False
ToggleSwitchToday.IsOn = False
@@ -508,7 +508,7 @@ Public Class frmFlowSearch
Case "ToggleSwitchLastMonth"
ToggleSwitchCurrentYear.IsOn = False
ToggleSwitchLastYear.IsOn = False
ToggleSwitchCurrentMonth.IsOn = False
ToggleSwitchMonth.IsOn = False
ToggleSwitchToday.IsOn = False
ToggleSwitchYesterday.IsOn = False
Dim currentDate As DateTime = DateTime.Now
@@ -520,20 +520,20 @@ Public Class frmFlowSearch
Case "ToggleSwitchToday"
ToggleSwitchCurrentYear.IsOn = False
ToggleSwitchLastYear.IsOn = False
ToggleSwitchCurrentMonth.IsOn = False
ToggleSwitchMonth.IsOn = False
ToggleSwitchYesterday.IsOn = False
oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())")
Case "ToggleSwitchYesterday"
ToggleSwitchCurrentYear.IsOn = False
ToggleSwitchLastYear.IsOn = False
ToggleSwitchCurrentMonth.IsOn = False
ToggleSwitchMonth.IsOn = False
ToggleSwitchToday.IsOn = False
oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)")
End Select
SEARCH_FACT_DATE = oWHENDATE
TOGGLE_Change = False
Else
If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchCurrentYear.IsOn = False And ToggleSwitchLastYear.IsOn = False And ToggleSwitchLastMonth.IsOn = False And ToggleSwitchCurrentMonth.IsOn = False Then
If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchCurrentYear.IsOn = False And ToggleSwitchLastYear.IsOn = False And ToggleSwitchLastMonth.IsOn = False And ToggleSwitchMonth.IsOn = False Then
LIMITATION_DATE = False
End If