MS anpassungen

This commit is contained in:
2022-02-15 17:28:32 +01:00
parent c2b81af556
commit 5f69002668
20 changed files with 707 additions and 484 deletions

View File

@@ -24,8 +24,21 @@ Public Class frmFlowSearch1
Private CONST_DATE_TOMORROW As String = "TOMORROW"
Private SEARCH_PARAM3
Dim oBASESEARCH As String
Private ExplizitDate As Boolean = False
Dim oBASESEARCH As String
Sub ResetTogglesDate()
TOGGLE_Change = True
ToggleSwitchToday.IsOn = False
ToggleSwitchYesterday.IsOn = False
ToggleSwitchTomorrow.IsOn = False
ToggleSwitchLastWeek.IsOn = False
ToggleSwitchYear_Last.IsOn = False
ToggleSwitchYear.IsOn = False
ToggleSwitchMonth.IsOn = False
ToggleSwitchMonth_Last.IsOn = False
TOGGLE_Change = False
End Sub
Private Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchYear.Toggled, ToggleSwitchYear_Last.Toggled,
ToggleSwitchMonth_Last.Toggled, ToggleSwitchMonth.Toggled, ToggleSwitchLastWeek.Toggled, ToggleSwitchTomorrow.Toggled
@@ -111,6 +124,7 @@ Public Class frmFlowSearch1
Case "ToggleSwitchLastWeek"
ToggleSwitchToday.IsOn = False
ToggleSwitchTomorrow.IsOn = False
ToggleSwitchYesterday.IsOn = False
ToggleSwitchYear.IsOn = False
ToggleSwitchYear_Last.IsOn = False
ToggleSwitchMonth.IsOn = False
@@ -218,17 +232,29 @@ Public Class frmFlowSearch1
.WindowGuid = "FlowSearch",
.WindowTitle = GetResultWindowString(oSearchTerm),
.OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow,
.ProfileGuid = 123456789
.ProfileGuid = 354522
}
Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}"
Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'"
If ExplizitDate Then
Dim oDate2 As Date
If Not IsNothing(DateEditTill.EditValue) Then
oDate2 = CDate(DateEditTill.EditValue)
Else
oDate2 = CDate(DateEditFrom.EditValue)
End If
Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'"
If My.DatabaseIDB.ExecuteNonQuery(oProc) = True Then
oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~DATEPART"
End If
End If
Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'"
If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then
Dim oDTDocResult = My.DatabaseIDB.GetDatatable(oBASESEARCH)
If oDTDocResult.Rows.Count > 0 Then
oParams.Results.Add(New DocumentResultList.DocumentResult() With {
.Title = "MySearchTitle",
.Title = "FlowSearchXYZ",
.Datatable = oDTDocResult})
Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams)
'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
@@ -241,7 +267,8 @@ Public Class frmFlowSearch1
End If
Else
bsiStatus.Caption = "Error oin FlowSearch - Check Your log"
End If
'
@@ -276,22 +303,36 @@ Public Class frmFlowSearch1
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
Me.txtSearchInput.Text = ""
ToggleSwitchToday.IsOn = False
ResetTogglesDate()
ToggleSwitchDateto.IsOn = False
ExplizitDate = False
End Sub
Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitch1.Toggled
Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchDateto.Toggled
Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch)
If oToggle.IsOn Then
DateEditBis.Enabled = True
DateEditTill.Enabled = True
lblDatefrom.Text = "Datum von"
Else
DateEditBis.Enabled = False
DateEditTill.Enabled = False
lblDatefrom.Text = "Datum"
End If
End Sub
Private Sub DateEdit1_DateTimeChanged(sender As Object, e As EventArgs) Handles DateEdit1.DateTimeChanged
ToggleSwitchToday.IsOn = False
Private Sub DateEdit1_DateTimeChanged(sender As Object, e As EventArgs) Handles DateEditFrom.DateTimeChanged
Dim oobj = DateEditFrom.EditValue
If Not IsNothing(oobj) Then
ResetTogglesDate()
End If
End Sub
Private Sub DateEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles DateEditFrom.EditValueChanged
Dim oobj = DateEditFrom.EditValue
If Not IsNothing(oobj) Then
ExplizitDate = True
End If
End Sub
End Class