Merge pull request #705 from africanmathsinitiative/master

update
IDEMSInternational · May 17, 2021 · e7f69b5 · e7f69b5
2 parents 6b2dd8e + c5a4dfc
commit e7f69b5
Show file tree

Hide file tree

Showing 55 changed files with 1,401 additions and 1,093 deletions.
diff --git a/instat/dlgAnonymiseIDColumn.Designer.vb b/instat/dlgAnonymiseIDColumn.Designer.vb
diff --git a/instat/dlgAnonymiseIDColumn.vb b/instat/dlgAnonymiseIDColumn.vb
@@ -57,11 +57,12 @@ Public Class dlgAnonymiseIDColumn
         ucrInputAlgorithm.SetItems(dctAlgorithm)
         ucrInputAlgorithm.SetDropDownStyleAsNonEditable()
 
-        ucrSaveAnonymisedColumn.SetPrefix("Hash")
+        ucrSaveAnonymisedColumn.SetPrefix("hash")
         ucrSaveAnonymisedColumn.SetSaveTypeAsColumn()
         ucrSaveAnonymisedColumn.SetDataFrameSelector(ucrSelectorAnonymiseIDColumn.ucrAvailableDataFrames)
         ucrSaveAnonymisedColumn.SetIsTextBox()
         ucrSaveAnonymisedColumn.SetLabelText("Column Name:")
+        ucrSaveAnonymisedColumn.setLinkedReceiver(ucrReceiverIDColumn)
     End Sub
 
     Private Sub SetDefaults()

diff --git a/instat/dlgClimaticDataEntry.vb b/instat/dlgClimaticDataEntry.vb
@@ -269,7 +269,7 @@ Public Class dlgClimaticDataEntry
         Return dfTemp
     End Function
 
-    Private Sub ucrChangedControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged, ucrReceiverDate.ControlValueChanged, ucrReceiverElements.ControlValueChanged, ucrReceiverViewVariables.ControlValueChanged, ucrInputType.ControlValueChanged, ucrStartDate.ControlValueChanged, ucrEndDate.ControlValueChanged, ucrPnlOptions.ControlValueChanged
+    Private Sub ucrChangedControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged, ucrReceiverDate.ControlValueChanged, ucrReceiverElements.ControlValueChanged, ucrReceiverViewVariables.ControlValueChanged, ucrInputType.ControlValueChanged, ucrStartDate.ControlValueChanged, ucrEndDate.ControlValueChanged, ucrInputSelectStation.ControlValueChanged, ucrPnlOptions.ControlValueChanged
         bChange = True
     End Sub
 

diff --git a/instat/dlgCombine.Designer.vb b/instat/dlgCombine.Designer.vb
diff --git a/instat/dlgCombine.resx b/instat/dlgCombine.resx
@@ -226,7 +226,7 @@
     <value>4, 5, 4, 5</value>
   </data>
   <data name="ucrNewColName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>294, 24</value>
+    <value>294, 22</value>
   </data>
   <data name="ucrNewColName.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>

diff --git a/instat/dlgCombine.vb b/instat/dlgCombine.vb
@@ -68,6 +68,7 @@ Public Class dlgCombine
         ucrNewColName.SetSaveTypeAsColumn()
         ucrNewColName.SetDataFrameSelector(ucrSelectorCombineFactors.ucrAvailableDataFrames)
         ucrNewColName.SetLabelText("New Column Name:")
+        ucrNewColName.setLinkedReceiver(ucrFactorsReceiver)
 
         'chkbox
         ucrChkDropUnusedLevels.SetParameter(New RParameter("drop", 1))

diff --git a/instat/dlgCombineText.Designer.vb b/instat/dlgCombineText.Designer.vb
diff --git a/instat/dlgCombineText.resx b/instat/dlgCombineText.resx
@@ -176,8 +176,12 @@
   <data name="ucrSaveColumn.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 209</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ucrSaveColumn.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
+  </data>
   <data name="ucrSaveColumn.Size" type="System.Drawing.Size, System.Drawing">
-    <value>305, 24</value>
+    <value>280, 22</value>
   </data>
   <data name="ucrSaveColumn.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -227,7 +231,6 @@
   <data name="ucrSelectorForCombineText.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 10</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ucrSelectorForCombineText.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>

diff --git a/instat/dlgCombineText.vb b/instat/dlgCombineText.vb
@@ -60,7 +60,8 @@ Public Class dlgCombineText
         ucrSaveColumn.SetPrefix("Combine")
         ucrSaveColumn.SetSaveTypeAsColumn()
         ucrSaveColumn.SetDataFrameSelector(ucrSelectorForCombineText.ucrAvailableDataFrames)
-        ucrSaveColumn.SetLabelText("Prefix for New Column:")
+        ucrSaveColumn.SetLabelText("New Column:")
+        ucrSaveColumn.setLinkedReceiver(ucrReceiverCombineText)
         iColumnsUsed = 0
     End Sub
 

diff --git a/instat/dlgCompare.Designer.vb b/instat/dlgCompare.Designer.vb