Abilitata ricerca per data in OFFICE
This commit is contained in:
@@ -405,17 +405,17 @@ Public Class SearchPanelSlabVM
|
||||
Query &= Slab.DB_WAREHOUSEPOS & " LIKE '%" & m_WarehousePosition & "%' "
|
||||
End If
|
||||
If Not IsNothing(m_StartAddedDate) Then
|
||||
If Not bIsOmagOFFICE Then
|
||||
If Not IsNothing(m_EndAddedDate) Then
|
||||
EvalWhere(bFirstWhere, Query)
|
||||
Query &= Slab.DB_ADDEDDATE & " BETWEEN Date('" & (String.Format("{0:yyyy-MM-dd}", m_StartAddedDate)) & "') AND Date('" & (String.Format("{0:yyyy-MM-dd}", m_EndAddedDate)) & "') "
|
||||
Else
|
||||
EvalWhere(bFirstWhere, Query)
|
||||
Query &= Slab.DB_ADDEDDATE & " = Date('" & (String.Format("{0:yyyy-MM-dd}", m_StartAddedDate)) & "') "
|
||||
End If
|
||||
'If Not bIsOmagOFFICE Then
|
||||
If Not IsNothing(m_EndAddedDate) Then
|
||||
EvalWhere(bFirstWhere, Query)
|
||||
Query &= Slab.DB_ADDEDDATE & " BETWEEN Date('" & (String.Format("{0:yyyy-MM-dd}", m_StartAddedDate)) & "') AND Date('" & (String.Format("{0:yyyy-MM-dd}", m_EndAddedDate)) & "') "
|
||||
Else
|
||||
EvalWhere(bFirstWhere, Query)
|
||||
Query &= Slab.DB_ADDEDDATE & " = Date('" & (String.Format("{0:yyyy-MM-dd}", m_StartAddedDate)) & "') "
|
||||
End If
|
||||
'End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Query &= ";"
|
||||
PhotoMap.refProjectVM.SlabList = New ObservableCollection(Of Slab)(ManageDb.ExecuteSlabReaderQuery(Query))
|
||||
RaiseEvent ScrollToTop()
|
||||
|
||||
Reference in New Issue
Block a user