Skip to content

Climsoft R-Instant QC Import #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Patowhiz wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Climsoft R-Instant QC Import #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
565f658
Merge pull request #89 from climsoft/master
conlooptechnologies Mar 23, 2023
68f23ab
changes
conlooptechnologies Mar 24, 2023
b14b616
more changes
conlooptechnologies Mar 25, 2023
b0c975f
more changes
conlooptechnologies Mar 28, 2023
37f1e23
Merge branch 'master' into instant_qc_import
conlooptechnologies Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ClimsoftVer4/ClimsoftVer4/ClimsoftVer4.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@
<Compile Include="frmFormUpload.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmImportQCData.Designer.vb">
<DependentUpon>frmImportQCData.vb</DependentUpon>
</Compile>
<Compile Include="frmImportQCData.vb">
<Compile Include="frmHourly2Sequencer.Designer.vb">
<DependentUpon>frmHourly2Sequencer.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -926,6 +930,8 @@
<EmbeddedResource Include="frmFormUpload.resx">
<DependentUpon>frmFormUpload.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmImportQCData.resx">
<DependentUpon>frmImportQCData.vb</DependentUpon>
<EmbeddedResource Include="frmHourly2Sequencer.resx">
<DependentUpon>frmHourly2Sequencer.vb</DependentUpon>
</EmbeddedResource>
Expand Down
281 changes: 91 additions & 190 deletions ClimsoftVer4/ClimsoftVer4/clsDataCall.vb
View file
Open in desktop

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions ClimsoftVer4/ClimsoftVer4/clsTableFilter.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Public Class TableFilter
End Sub

Public Sub New(lstTblFilters As IEnumerable(Of TableFilter), Optional strOperator As String = "AND")
SetFilters(lstTblFilters, strOperator:=strOperator)
SetFilters(lstTblFilters, strFiltersCombination:=strOperator)
End Sub

Public Sub SetField(strNewField As String)
Expand Down Expand Up @@ -239,8 +239,8 @@ Public Class TableFilter
''' Will combine the list of filters into one filter
''' </summary>
''' <param name="lstTblFilters"></param>
''' <param name="strOperator"></param>
Public Sub SetFilters(lstTblFilters As IEnumerable(Of TableFilter), Optional strOperator As String = "AND")
''' <param name="strFiltersCombination"></param>
Public Sub SetFilters(lstTblFilters As IEnumerable(Of TableFilter), Optional strFiltersCombination As String = "AND")
Dim max As Integer = lstTblFilters.Count - 1
For i As Integer = 0 To max
If i = 0 Then
Expand All @@ -251,7 +251,7 @@ Public Class TableFilter

If i <= max - 1 Then
Me.SetRightFilter(lstTblFilters(i + 1))
Me.SetOperator(strOperator)
Me.SetOperator(strFiltersCombination)
If i + 1 = max Then
Exit For
End If
Expand All @@ -266,33 +266,33 @@ Public Class TableFilter
' Return Function(x) CallByName(x, "stationId", CallType.Get) = "67774010"
'End Function

Public Function GetLinqExpression() As String
Dim strExpression As String

If bIsCombinedFilter Then
strExpression = clsLeftFilter.GetLinqExpression() & " " & strOperator & " " & clsRightFilter.GetLinqExpression()
Else
strExpression = strField
If bArrayOperator Then
If bValuesFromDataCall Then
strExpression = strExpression & "[" & clsDataCallValues.GetValuesAsString() & "]"
Else
strExpression = strExpression & "[" & String.Join(",", lstValues) & "]"
End If
Else
If bValuesAsString Then
strExpression = strExpression & " " & strOperator & " " & Chr(34) & objValue & Chr(34)
Else
strExpression = strExpression & " " & strOperator & " " & objValue
End If
End If
End If
strExpression = "(" & strExpression & ")"
If Not bIsPositiveCondition Then
strExpression = "not " & strExpression
End If
Return strExpression
End Function
'Public Function GetLinqExpression() As String
' Dim strExpression As String

' If bIsCombinedFilter Then
' strExpression = clsLeftFilter.GetLinqExpression() & " " & strOperator & " " & clsRightFilter.GetLinqExpression()
' Else
' strExpression = strField
' If bArrayOperator Then
' If bValuesFromDataCall Then
' strExpression = strExpression & "[" & clsDataCallValues.GetValuesAsString() & "]"
' Else
' strExpression = strExpression & "[" & String.Join(",", lstValues) & "]"
' End If
' Else
' If bValuesAsString Then
' strExpression = strExpression & " " & strOperator & " " & Chr(34) & objValue & Chr(34)
' Else
' strExpression = strExpression & " " & strOperator & " " & objValue
' End If
' End If
' End If
' strExpression = "(" & strExpression & ")"
' If Not bIsPositiveCondition Then
' strExpression = "not " & strExpression
' End If
' Return strExpression
'End Function

Public Function GetSqlExpression() As String
Dim strExpression As String
Expand Down
198 changes: 198 additions & 0 deletions ClimsoftVer4/ClimsoftVer4/frmImportQCData.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading