Merge pull request africanmathsinitiative#38 from opencdms/dev

updating my Dev

ClimsoftVer4/ClimsoftVer4/ClimsoftVer4.vbproj

@@ -202,6 +202,12 @@
     <Compile Include="formAgro1.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="formSynopticCaribbean.Designer.vb">
+      <DependentUpon>formSynopticCaribbean.vb</DependentUpon>
+    </Compile>
+    <Compile Include="formSynopticCaribbean.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="form_agro1.vb">
       <DependentUpon>Model1.tt</DependentUpon>
       <SubType>Form</SubType>
@@ -812,6 +818,30 @@
     <Compile Include="seq_month_day_synoptime_leap_yr.vb">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\frmNewAgroMet.Designer.vb">
+      <DependentUpon>frmNewAgroMet.vb</DependentUpon>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\frmNewAgroMet.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\frmNewCaribbean.Designer.vb">
+      <DependentUpon>frmNewCaribbean.vb</DependentUpon>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\frmNewCaribbean.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\ucrAgroMet.Designer.vb">
+      <DependentUpon>ucrAgroMet.vb</DependentUpon>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\ucrAgroMet.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\ucrCaribbean.Designer.vb">
+      <DependentUpon>ucrCaribbean.vb</DependentUpon>
+    </Compile>
+    <Compile Include="static\ClimateObject\man\rdsav\ucrCaribbean.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="station.vb">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
@@ -1015,6 +1045,9 @@
     <EmbeddedResource Include="formAgro1.resx">
       <DependentUpon>formAgro1.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="formSynopticCaribbean.resx">
+      <DependentUpon>formSynopticCaribbean.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmElementSequencerMonthly.resx">
       <DependentUpon>frmElementSequencerMonthly.vb</DependentUpon>
     </EmbeddedResource>
@@ -1443,6 +1476,18 @@
     <EmbeddedResource Include="sdgFilter.resx">
       <DependentUpon>sdgFilter.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="static\ClimateObject\man\rdsav\frmNewAgroMet.resx">
+      <DependentUpon>frmNewAgroMet.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="static\ClimateObject\man\rdsav\frmNewCaribbean.resx">
+      <DependentUpon>frmNewCaribbean.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="static\ClimateObject\man\rdsav\ucrAgroMet.resx">
+      <DependentUpon>ucrAgroMet.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="static\ClimateObject\man\rdsav\ucrCaribbean.resx">
+      <DependentUpon>ucrCaribbean.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ucrBaseDataLink.resx">
       <DependentUpon>ucrBaseDataLink.vb</DependentUpon>
     </EmbeddedResource>

ClimsoftVer4/ClimsoftVer4/dataEntryGlobalRoutines.vb

@@ -495,7 +495,7 @@ Public Class dataEntryGlobalRoutines
         Try
             With frm
                 If Not Entered_Value(con, stnid, elmcode, yy, mm, dd, hh, obsv1) Then
-                    MsgBox("Can't Compare. Data not previously entered")
+                    MsgBox("Can't Compare. Data not previously uploaded")
                     Exit Function
                 Else
 
@@ -556,7 +556,7 @@ Public Class dataEntryGlobalRoutines
             d.SelectCommand.CommandTimeout = 0
             s.Clear()
             d.Fill(s, "forms")
-            'MsgBox(sql)
+            If s.Tables("forms").Rows.Count = 0 Then Return "Single"
             'MsgBox(Val(s.Tables("forms").Rows(0).Item(0)))
             If Val(s.Tables("forms").Rows(0).Item(0)) = 1 Then Key_Entry_Mode = "Double"
 

ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx

@@ -691,6 +691,9 @@
   <metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>106, 17</value>
   </metadata>
+  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>195, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>37</value>
   </metadata>

ClimsoftVer4/ClimsoftVer4/formAWSRealTime.vb

@@ -70,6 +70,7 @@ Public Class formAWSRealTime
         dbconn.Open()
 
         ShowPanel(pnlProcessing, "Process Settings")
+        Me.Text = "AWS Real Time"
         load_PressingParameters("txtlFill")
         load_Indicators(dbconn)
         Timer1.Start()
@@ -3670,6 +3671,8 @@ Err:
                 Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "structuressettings.htm")
             Case "Message Coding Settings"
                 Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "codingsettings.htm")
+            Case "AWS Real Time"
+                Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "awsrealtimeoperations.htm")
         End Select
 
     End Sub

ClimsoftVer4/ClimsoftVer4/formDataView.vb

@@ -150,6 +150,7 @@ Public Class formDataView
 
     Private Sub btnUpdate_Click(sender As Object, e As EventArgs) Handles btnUpdate.Click
         ''Added June 2016. ASM
+
         Try
             Dim cellValue As String, cellColName As String, k As Integer
             'MsgBox("Source Table: " & dsSourceTableName)
@@ -189,7 +190,6 @@ Public Class formDataView
                     k = Me.DataGridView.CurrentCell.ColumnIndex
                     cellColName = Me.DataGridView.Columns(k).HeaderText
                     cellValue = Me.DataGridView.CurrentCell.Value
-
                     If k = 1 Then
                         'Check if there is a backslash "\" in the case of folder locations
                         If InStr(cellValue, "\") > 0 Then
@@ -198,9 +198,8 @@ Public Class formDataView
                             cellValue = cellValue.Replace("\", "\\")
                         End If
                         'Generate SQL string for updating the selected value 
-                        Sql = "UPDATE regkeys SET " & cellColName & "='" & cellValue & "' WHERE keyName='" & keyNameValue & "';"
                     End If
-
+                    Sql = "UPDATE regkeys SET " & cellColName & "='" & cellValue & "' WHERE keyName='" & keyNameValue & "';"
                 ' Update metadata tables
                 Case "station"
                     id = Me.DataGridView.CurrentRow.Cells(0).Value

ClimsoftVer4/ClimsoftVer4/formMetadata.resx

@@ -1636,6 +1636,9 @@
   <metadata name="MetadataFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>152, 17</value>
   </metadata>
+  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>35</value>
   </metadata>

ClimsoftVer4/ClimsoftVer4/formPaperArchive.resx

@@ -336,6 +336,9 @@
   <metadata name="OpenFilePaperArchive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>327, 17</value>
   </metadata>
+  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>499, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>

ClimsoftVer4/ClimsoftVer4/formPaperArchive.vb

@@ -638,6 +638,8 @@ Err:
                 Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "unstructuredfiles.htm")
             Case 2
                 Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "viewimages.htm")
+            Case 3
+                Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "archivelist.htm")
         End Select
 
     End Sub

ClimsoftVer4/ClimsoftVer4/formProducts.vb

@@ -128,10 +128,6 @@ Public Class frmProducts
     '    Next
     'End Function
 
-    Private Sub lstvProducts_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lstvProducts.SelectedIndexChanged
-
-    End Sub
-
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
         Me.Hide()
     End Sub
@@ -149,6 +145,7 @@ Public Class frmProducts
     End Sub
 
     Private Sub HelpToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HelpToolStripMenuItem.Click
-        Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm")
+        Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#products")
+
     End Sub
 End Class

ClimsoftVer4/ClimsoftVer4/formProductsSelectCriteria.resx

@@ -172,6 +172,9 @@
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>132, 17</value>
   </metadata>
+  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>346, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>

ClimsoftVer4/ClimsoftVer4/formProductsSelectCriteria.vb

@@ -1368,7 +1368,21 @@ Err:
     End Function
 
     Private Sub HelpToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HelpToolStripMenuItem.Click
-        Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#producstcriteria")
+        If lblProductType.Text = "Inventory" Or lblProductType.Text = "Missing Data" Then
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#inventory")
+        ElseIf lblProductType.Text = "WindRose" Then
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#windrose")
+        ElseIf lblProductType.Text = "CPT" Then
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#cpt")
+        ElseIf lblProductType.Text = "Instat" Then
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#instat")
+        ElseIf lblProductType.Text = "Rclimdex" Then
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#rclimdex")
+        ElseIf lblProductType.Text = "GeoCLIM Monthly" Or lblProductType.Text = "GeoCLIM Dekadal" Or lblProductType.Text = "GeoCLIM Daily" Then
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#geoclim")
+        Else
+            Help.ShowHelp(Me, Application.StartupPath & "\climsoft4.chm", "climateproducts.htm#products")
+        End If
     End Sub
 
     Private Sub cmdClearElements_Click(sender As Object, e As EventArgs) Handles cmdClearElements.Click