Merge pull request #228 from africanmathsinitiative/master

update define climatic branch
IDEMSInternational · Feb 3, 2017 · b926b4b · b926b4b
2 parents c5c9cb3 + 8e63f94
commit b926b4b
Show file tree

Hide file tree

Showing 193 changed files with 528 additions and 10,358 deletions.
diff --git a/instat/UcrPanel.vb b/instat/UcrPanel.vb
@@ -64,7 +64,7 @@ Public Class UcrPanel
         OnControlValueChanged()
     End Sub
 
-    Protected Overrides Sub SetControlValue(objTemp As Object)
+    Protected Overrides Sub SetToValue(objTemp As Object)
         Dim rdoTemp As RadioButton
 
         If TypeOf objTemp Is RadioButton Then
@@ -74,4 +74,8 @@ Public Class UcrPanel
             MsgBox("Developer error: Cannot set the value of " & Name & " because cannot convert value of object to radio button.")
         End If
     End Sub
+
+    Private Sub UcrPanel_Load(sender As Object, e As EventArgs) Handles Me.Load
+        bAllowNonConditionValues = False
+    End Sub
 End Class
diff --git a/instat/dlgAddStartRain.designer.vb b/instat/dlgAddStartRain.designer.vb
diff --git a/instat/dlgAddStartRain.fr-FR.resx b/instat/dlgAddStartRain.fr-FR.resx
diff --git a/instat/dlgAddStartRain.resx b/instat/dlgAddStartRain.resx
diff --git a/instat/dlgAddStartRain.sw-KE.resx b/instat/dlgAddStartRain.sw-KE.resx
diff --git a/instat/dlgAddStartRain.vb b/instat/dlgAddStartRain.vb