Merge pull request #7 from africanmathsinitiative/master

merge from main
IDEMSInternational · Nov 12, 2015 · 11bd799 · 11bd799
2 parents bde5209 + 7bcc106
commit 11bd799
Show file tree

Hide file tree

Showing 20 changed files with 1,231 additions and 288 deletions.
diff --git a/instat/MultilingualResources/instat.fr-FR.xlf b/instat/MultilingualResources/instat.fr-FR.xlf
@@ -1156,4 +1156,20 @@
       <group id="INSTAT/DLGYEARRAINCOUNT.RESX" datatype="resx" />
     </body>
   </file>
+  <file datatype="xml" source-language="en-US" target-language="fr-FR" original="INSTAT/FRMMETADATA.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
+    <header>
+      <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.1466.0" tool-company="Microsoft" />
+    </header>
+    <body>
+      <group id="INSTAT/FRMMETADATA.RESX" datatype="resx" />
+    </body>
+  </file>
+  <file datatype="xml" source-language="en-US" target-language="fr-FR" original="INSTAT/FRMVARIABLES.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
+    <header>
+      <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.1466.0" tool-company="Microsoft" />
+    </header>
+    <body>
+      <group id="INSTAT/FRMVARIABLES.RESX" datatype="resx" />
+    </body>
+  </file>
 </xliff>
diff --git a/instat/MultilingualResources/instat.sw-KE.xlf b/instat/MultilingualResources/instat.sw-KE.xlf
@@ -1157,4 +1157,20 @@
       <group id="INSTAT/DLGYEARRAINCOUNT.RESX" datatype="resx" />
     </body>
   </file>
+  <file datatype="xml" source-language="en-US" target-language="sw-KE" original="INSTAT/FRMMETADATA.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
+    <header>
+      <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.1466.0" tool-company="Microsoft" />
+    </header>
+    <body>
+      <group id="INSTAT/FRMMETADATA.RESX" datatype="resx" />
+    </body>
+  </file>
+  <file datatype="xml" source-language="en-US" target-language="sw-KE" original="INSTAT/FRMVARIABLES.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
+    <header>
+      <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.1466.0" tool-company="Microsoft" />
+    </header>
+    <body>
+      <group id="INSTAT/FRMVARIABLES.RESX" datatype="resx" />
+    </body>
+  </file>
 </xliff>
diff --git a/instat/dlgRegularSequence.designer.vb b/instat/dlgRegularSequence.designer.vb
diff --git a/instat/dlgRegularSequence.vb b/instat/dlgRegularSequence.vb
@@ -18,8 +18,8 @@ Public Class dlgRegularSequence
     Private Sub dlgRegularSequence_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         grpSequence2.Hide()
         grpRepeatSingle.Hide()
-        UcrBase.clsRsyntax.SetFunction("seq")
-        UcrBase.clsRsyntax.iCallType = 2
+        ucrBase.clsRsyntax.SetFunction("seq")
+        ucrBase.clsRsyntax.iCallType = 1
         autoTranslate(Me)
     End Sub
 
@@ -42,34 +42,37 @@ Public Class dlgRegularSequence
     End Sub
 
     Private Sub txtFrom_Leave(sender As Object, e As EventArgs) Handles txtFrom.Leave
-        UcrBase.clsRsyntax.AddParameter("from", txtFrom.Text)
+        ucrBase.clsRsyntax.AddParameter("from", txtFrom.Text)
     End Sub
 
-    Private Sub txtTo_TextChanged(sender As Object, e As EventArgs) Handles txtTo.TextChanged
-        UcrBase.clsRsyntax.AddParameter("to", txtTo.Text)
+    Private Sub txtTo_TextChanged(sender As Object, e As EventArgs) Handles txtTo.Leave
+        ucrBase.clsRsyntax.AddParameter("to", txtTo.Text)
     End Sub
 
-    Private Sub txtSteps_TextChanged(sender As Object, e As EventArgs) Handles txtSteps.TextChanged
-        UcrBase.clsRsyntax.AddParameter("by", txtSteps.Text)
+    Private Sub txtSteps_TextChanged(sender As Object, e As EventArgs) Handles txtSteps.Leave
+        ucrBase.clsRsyntax.AddParameter("by", txtSteps.Text)
     End Sub
 
-    Private Sub datePicker1_ValueChanged(sender As Object, e As EventArgs) Handles datePicker1.ValueChanged
-        UcrBase.clsRsyntax.AddParameter("from", Format(datePicker1.Value, "yyyy/MM/dd"))
+    Private Sub dtSelectorA_Leave(sender As Object, e As EventArgs) Handles dtSelectorA.Leave
+        ucrBase.clsRsyntax.AddParameter("from", "as.Date('" & Format(dtSelectorA.Value, "yyyy/MM/dd") & "')")
     End Sub
 
-    Private Sub datePicker2_ValueChanged(sender As Object, e As EventArgs) Handles datePicker2.ValueChanged
-        UcrBase.clsRsyntax.AddParameter("to", Format(datePicker2.Value, "yyyy/MM/dd"))
+    Private Sub dtSelectorB_Leave(sender As Object, e As EventArgs) Handles dtSelectorB.Leave
+        ucrBase.clsRsyntax.AddParameter("to", "as.Date('" & Format(dtSelectorB.Value, "yyyy/MM/dd") & "')")
     End Sub
 
-    Private Sub cboBy_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboBy.SelectedIndexChanged
-        UcrBase.clsRsyntax.AddParameter("by", cboBy.SelectedItem.ToString())
+    Private Sub cboBy_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboBy.Leave
+        ucrBase.clsRsyntax.AddParameter("by", "'" & cboBy.SelectedItem.ToString() & "'")
     End Sub
 
-    Private Sub txtValue_TextChanged(sender As Object, e As EventArgs) Handles txtValue.TextChanged
-        UcrBase.clsRsyntax.AddParameter("from", Format(datePicker2.Value, "yyyy/MM/dd"))
+    Private Sub txtValue_TextChanged(sender As Object, e As EventArgs) Handles txtValue.Leave
+        Dim funct() As String = {"from", "to"}
+        For Each Val As String In funct
+            ucrBase.clsRsyntax.AddParameter(Val, txtValue.Text)
+        Next
     End Sub
 
-    Private Sub txtRepeatTimes_TextChanged(sender As Object, e As EventArgs) Handles txtRepeatTimes.TextChanged
-        UcrBase.clsRsyntax.AddParameter("length.out", txtRepeatTimes.Text)
+    Private Sub txtRepeatTimes_TextChanged(sender As Object, e As EventArgs) Handles txtRepeatTimes.Leave
+        ucrBase.clsRsyntax.AddParameter("length.out", txtRepeatTimes.Text)
     End Sub
 End Class
diff --git a/instat/frmEditor.Designer.vb b/instat/frmEditor.Designer.vb
diff --git a/instat/frmEditor.vb b/instat/frmEditor.vb
@@ -20,29 +20,29 @@ Imports System.Threading
 Imports instat.Translations
 Public Class frmEditor
     Public Sub UpdateSheet(DataSet As DataFrame)
-        Me.grid.CurrentWorksheet.Reset()
-        Me.grid.CurrentWorksheet.Rows = DataSet.RowCount
-        Me.grid.CurrentWorksheet.Columns = DataSet.ColumnCount
+        Me.gridColumns.CurrentWorksheet.Reset()
+        Me.gridColumns.CurrentWorksheet.Rows = DataSet.RowCount
+        Me.gridColumns.CurrentWorksheet.Columns = DataSet.ColumnCount
         For k As Integer = 0 To DataSet.ColumnCount - 1
-            Me.grid.CurrentWorksheet.ColumnHeaders(k).Text = DataSet.ColumnNames(k)
+            Me.gridColumns.CurrentWorksheet.ColumnHeaders(k).Text = DataSet.ColumnNames(k)
         Next
         For i As Integer = 0 To DataSet.RowCount - 1
             For k As Integer = 0 To DataSet.ColumnCount - 1
-                Me.grid.CurrentWorksheet(row:=i, col:=k) = DataSet(i, k)
+                Me.gridColumns.CurrentWorksheet(row:=i, col:=k) = DataSet(i, k)
             Next
         Next
 
     End Sub
     Private Sub frmEditor_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        grid.SheetTabControlWidth = 300
-        grid.CurrentWorksheet.Resize(1, 1)
-        grid.CurrentWorksheet.Name = "Data View"
+        gridColumns.SheetTabControlWidth = 300
+        gridColumns.CurrentWorksheet.Resize(1, 1)
+        gridColumns.CurrentWorksheet.Name = "Data View"
         autoTranslate(Me)
     End Sub
     Public Sub NewSheet()
-        Dim sheet = grid.CreateWorksheet()
+        Dim sheet = gridColumns.CreateWorksheet()
         'Add/Insert worksheet
-        grid.Worksheets.Add(sheet)
-        grid.CurrentWorksheet = sheet
+        gridColumns.Worksheets.Add(sheet)
+        gridColumns.CurrentWorksheet = sheet
     End Sub
 End Class