Merge pull request #321 from IDEMSInternational/master

update

instat/dlgRestrict.vb

@@ -210,6 +210,7 @@ Public Class dlgRestrict
 
     Private Sub cmdFilterFromFactors_Click(sender As Object, e As EventArgs) Handles cmdFilterFromFactors.Click
         sdgFiltersFromFactor.SetRcodeAndDefaultDataFrame(ucrSelectorFilter, bReset:=bResetSubdialog)
+        sdgFiltersFromFactor.enumFactorMode = sdgFiltersFromFactor.FactorMode.Filter
         sdgFiltersFromFactor.ShowDialog()
         bResetSubdialog = False
         ucrSelectorFilter.LoadList()

instat/instat.vbproj

@@ -391,10 +391,10 @@
     <Compile Include="sdgSummaryThemes.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="static\InstatObject\R\dlgOutfillingStationData.Designer.vb">
+    <Compile Include="dlgOutfillingStationData.Designer.vb">
       <DependentUpon>dlgOutfillingStationData.vb</DependentUpon>
     </Compile>
-    <Compile Include="static\InstatObject\R\dlgOutfillingStationData.vb">
+    <Compile Include="dlgOutfillingStationData.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="UserTables\Cells\FootNotes\ucrCellsFootNotes.Designer.vb">
@@ -3450,7 +3450,7 @@
     <EmbeddedResource Include="sdgSummaryThemes.resx">
       <DependentUpon>sdgSummaryThemes.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="static\InstatObject\R\dlgOutfillingStationData.resx">
+    <EmbeddedResource Include="dlgOutfillingStationData.resx">
       <DependentUpon>dlgOutfillingStationData.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserTables\Cells\FootNotes\ucrCellsFootNotes.resx">

instat/sdgFiltersFromFactor.vb

@@ -19,6 +19,11 @@ Public Class sdgFiltersFromFactor
     Private bFirstLoad As Boolean
     Private bReset As Boolean = True
     Private clsAddFilterFromFactors As RFunction
+    Public enumFactorMode As String = FactorMode.Filter
+    Public Enum FactorMode
+        OutFilling
+        Filter
+    End Enum
 
     Public Sub New()
         'This call is required by the designer.
@@ -35,6 +40,7 @@ Public Class sdgFiltersFromFactor
             InitialiseControls()
             bFirstLoad = False
         End If
+        OpeningMode()
         autoTranslate(Me)
     End Sub
 
@@ -55,18 +61,20 @@ Public Class sdgFiltersFromFactor
                                                   dctParamAndColNames:=dctParamAndColNames,
                                                   hiddenColNames:={ucrFactor.DefaultColumnNames.Level},
                                                   bIncludeNALevel:=False)
+        ' Automatically select all rows by default
+        AddHandler ucrReceiverFactor.SelectionChanged, AddressOf SelectAllFactorLevels
 
     End Sub
 
     Public Sub SetRcodeAndDefaultDataFrame(ucrNewBaseSelector As ucrSelector, bReset As Boolean)
         If ucrNewBaseSelector IsNot Nothing AndAlso ucrNewBaseSelector.strCurrentDataFrame <> "" Then
             ucrSelectorFiltersFromFactors.SetDataframe(ucrNewBaseSelector.strCurrentDataFrame, False)
         End If
-        ucrReceiverFactor.SetRCode(clsAddFilterFromFactors, bReset)
-        ucrFactorLevels.SetRCode(clsAddFilterFromFactors, bReset)
 
         If bReset Then
             ucrSelectorFiltersFromFactors.Reset()
+            ucrFactorLevels.SetRCode(clsAddFilterFromFactors, bReset)
+            ucrReceiverFactor.SetRCode(clsAddFilterFromFactors, bReset)
         End If
     End Sub
 
@@ -79,4 +87,31 @@ Public Class sdgFiltersFromFactor
     Private Sub ucrSelectorFiltersFromFactors_DataFrameChanged() Handles ucrSelectorFiltersFromFactors.DataFrameChanged
         clsAddFilterFromFactors.AddParameter("data_name", Chr(34) & ucrSelectorFiltersFromFactors.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
     End Sub
+
+    Public Function GetSelectedStations() As String
+        Dim strSelectedLevels As String = mdlCoreControl.GetRVector(
+        ucrFactorLevels.GetSelectedCellValues(ucrFactor.DefaultColumnNames.Label, True)
+    )
+
+        If strSelectedLevels <> "" Then
+            Return strSelectedLevels
+        Else
+            Return ""
+        End If
+    End Function
+
+    Private Sub SelectAllFactorLevels()
+        If ucrFactorLevels.RowCount > 0 Then
+            ucrFactorLevels.SelectAllGridRows(True) ' Pass True to select all rows
+        End If
+    End Sub
+
+    Private Sub OpeningMode()
+        Select Case enumFactorMode
+            Case FactorMode.Filter
+                Me.Text = "Filters From Factor"
+            Case FactorMode.OutFilling
+                Me.Text = "Stations to Include"
+        End Select
+    End Sub
 End Class