Skip to content
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

Fixes importing of Climsoft observation data using station names #9137

Merged
merged 8 commits into from
Sep 18, 2024
Merged

Fixes importing of Climsoft observation data using station names #9137

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ce9e23a
Merge pull request #489 from IDEMSInternational/master
Patowhiz Jul 28, 2024
f575666
Merge pull request #492 from IDEMSInternational/master
Patowhiz Aug 13, 2024
5bb25f1
Merge pull request #494 from IDEMSInternational/master
Patowhiz Aug 29, 2024
2cf3eb5
Merge pull request #495 from IDEMSInternational/master
Patowhiz Sep 13, 2024
ff97c4b
escaped characters
conlooptechnologies Sep 16, 2024
da03d2d
removed wizard menu item
conlooptechnologies Sep 16, 2024
89ed9aa
added suggested changes
conlooptechnologies Sep 17, 2024
8e7c0b0
changed frmMain title
conlooptechnologies Sep 18, 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
30 changes: 15 additions & 15 deletions instat/dlgClimSoft.Designer.vb
View file
Open in desktop

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

16 changes: 14 additions & 2 deletions instat/dlgClimSoft.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ Public Class dlgClimSoft
Dim strTableName As String = dctTables.Item(ucrCboTable.GetText).Trim("""")
Dim strStationColumn As String = dctStationCols.Item(ucrCboStations.GetText).Trim("""")
Dim strElementsColumn As String = dctElementsCols.Item(ucrCboElements.GetText).Trim("""")
Dim strStationsValues As String = String.Join(",", ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=True, strQuotes:="'"))
Dim strElementsValues As String = String.Join(",", ucrReceiverMultipleElements.GetVariableNamesList(bWithQuotes:=True, strQuotes:="'"))
Dim strStationsValues As String = GetSQLArrayFilter(ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=False))
Dim strElementsValues As String = GetSQLArrayFilter(ucrReceiverMultipleElements.GetVariableNamesList(bWithQuotes:=False))
Dim strQueryCondition As String = " INNER JOIN station ON " & strTableName & ".recordedFrom = station.stationId" &
" INNER JOIN obselement ON " & strTableName & ".describedBy = obselement.elementId WHERE" &
" station." & strStationColumn & " IN (" & strStationsValues & ")" &
Expand Down Expand Up @@ -308,6 +308,18 @@ Public Class dlgClimSoft
End Try
End Sub

Private Function GetSQLArrayFilter(values() As String) As String
Dim strSQL As String = ""
For index As Integer = 0 To values.Length - 1
If index = 0 Then
strSQL = "'" & values(index).Replace("'", "''") & "'"
Else
strSQL = strSQL & "," & "'" & values(index).Replace("'", "''") & "'"
End If
Next
Return strSQL
End Function

Private Sub ucrControlsContents_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlContentsChanged, ucrReceiverMultipleElements.ControlContentsChanged, ucrCboTable.ControlContentsChanged, ucrCboQCStatus.ControlContentsChanged, ucrDtpStartDataDate.ControlContentsChanged, ucrDtpEndDataDate.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkImportStationsMetadata.ControlContentsChanged, ucrChkImportElementsMetadata.ControlContentsChanged, ucrChkImportFlagsMetadata.ControlContentsChanged
Dim bValid As Boolean = False
If rdoData.Checked Then
Expand Down
Loading
Loading