Made suggested changes

jkmusyoka · Jul 23, 2024 · d1af34c · d1af34c
1 parent 53b237b
commit d1af34c
Show file tree

Hide file tree

Showing 7 changed files with 336 additions and 112 deletions.
diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb
diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb
@@ -109,9 +109,16 @@ Public Class dlgClimSoft
         ucrCboQCStatus.SetLinkedDisplayControl(lblSelectQCStatus)
         '---------------------------------------
 
+        'Unstack data
+        '---------------------------------------
+        ucrChKUnstackData.SetText("Unstack Data")
+        ucrChKUnstackData.SetParameter(New RParameter("unstack_data", 13))
+        ucrChKUnstackData.SetRDefault("FALSE")
+        '---------------------------------------
+
         'date range
         '---------------------------------------
-        ucrChkDataDate.SetText("Select Data Date")
+        ucrChkDataDate.SetText("Select Dates")
 
         ucrDtpStartDataDate.SetParameter(New RParameter("start_date", 6))
         ucrDtpStartDataDate.SetParameterIsRDate()
@@ -147,7 +154,7 @@ Public Class dlgClimSoft
         ucrPnlOptions.AddFunctionNamesCondition(rdoMetadata, frmMain.clsRLink.strInstatDataObject & "$import_climsoft_metadata")
 
 
-        ucrPnlOptions.AddToLinkedControls({ucrCboTable, ucrCboQCStatus, ucrSelectorForClimSoft, ucrReceiverMultipleStations, ucrReceiverMultipleElements, ucrCboStations, ucrCboElements, ucrChkDataDate},
+        ucrPnlOptions.AddToLinkedControls({ucrCboTable, ucrCboQCStatus, ucrSelectorForClimSoft, ucrReceiverMultipleStations, ucrReceiverMultipleElements, ucrCboStations, ucrCboElements, ucrChkDataDate, ucrChKUnstackData},
                                           {rdoData}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True)
         ucrPnlOptions.AddToLinkedControls({ucrChkImportStationsMetadata, ucrChkImportElementsMetadata, ucrChkImportFlagsMetadata},
                                         {rdoMetadata}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True)
@@ -163,7 +170,7 @@ Public Class dlgClimSoft
         'data command
         '---------------------------------------
         clsRImportClimsoftData.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_climsoft_data")
-        clsRImportClimsoftData.AddParameter(strParameterName:="table", strParameterValue:=Chr(34) & "observationinitial" & Chr(34), iPosition:=0)
+        clsRImportClimsoftData.AddParameter(strParameterName:="table", strParameterValue:=Chr(34) & "observationfinal" & Chr(34), iPosition:=0)
         clsRImportClimsoftData.AddParameter(strParameterName:="station_filter_column", strParameterValue:=Chr(34) & "stationId" & Chr(34), iPosition:=1)
         clsRImportClimsoftData.AddParameter(strParameterName:="element_filter_column", strParameterValue:=Chr(34) & "elementId" & Chr(34), iPosition:=3)
         '---------------------------------------
@@ -193,6 +200,8 @@ Public Class dlgClimSoft
 
         ucrCboTable.SetRCode(clsRImportClimsoftData, bReset)
 
+        ucrChKUnstackData.SetRCode(clsRImportClimsoftData, bReset)
+
         ucrCboQCStatus.SetRCode(clsRImportClimsoftData, bReset)
 
         ucrDtpStartDataDate.SetRCode(clsRImportClimsoftData, bReset)

diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -3206,6 +3206,9 @@
     <EmbeddedResource Include="dlgThreeVariablePivotTable.resx">
       <DependentUpon>dlgThreeVariablePivotTable.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="sdgClimsoft.resx">
+      <DependentUpon>sdgClimsoft.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="sdgDefineAnnualRainfall.resx">
       <DependentUpon>sdgDefineAnnualRainfall.vb</DependentUpon>
     </EmbeddedResource>