Merge pull request #4 from mcrossley/master

b3053
cumulusmx · Oct 25, 2019 · 21ec4c7 · 21ec4c7
2 parents 14889ca + 66cf226
commit 21ec4c7
Show file tree

Hide file tree

Showing 27 changed files with 1,022 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.exe
 *.exe.config
 *.pdb
+updates.txt
diff --git a/Extrafileheader.txt b/Extrafileheader.txt
@@ -0,0 +1 @@
+Date (dd/mm/yy)|Time|Temperature1|Temperature2|Temperature3|Temperature4|Temperature5|Temperature6|Temperature7|Temperature8|Temperature9|Temperature10|Humidity1|Humidity2|Humidity3|Humidity4|Humidity5|Humidity6|Humidity7|Humidity8|Humidity9|Humidity10|Dew point1|Dew point2|Dew point3|Dew point4|Dew point5|Dew point6|Dew point7|Dew point8|Dew point9|Dew point10|Soil temp1|Soil temp2|Soil temp3|Soil temp4|Soil Moisture1|Soil Moisture2|Soil Moisture3|Soil Moisture4|Leaf temp1|Leaf temp2|Leaf wetness1|Leaf wetness2
diff --git a/interface/calibrationsettings.html b/interface/calibrationsettings.html
@@ -73,6 +73,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown active">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/charts.html b/interface/charts.html
@@ -69,6 +69,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/datalogs.html b/interface/datalogs.html
@@ -107,6 +107,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/dayfileviewer.html b/interface/dayfileviewer.html
@@ -79,6 +79,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/diaryeditor.html b/interface/diaryeditor.html
@@ -65,6 +65,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/extra.html b/interface/extra.html
@@ -55,6 +55,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/extradatalogs.html b/interface/extradatalogs.html
@@ -106,6 +106,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/extrawebfiles.html b/interface/extrawebfiles.html
@@ -96,6 +96,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown active">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/gauges.html b/interface/gauges.html
@@ -65,6 +65,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/index.html b/interface/index.html
@@ -64,6 +64,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/internetsettings.html b/interface/internetsettings.html
@@ -72,6 +72,13 @@
                                 <li><a href="dayfileviewer.html">Dayfile</a></li>
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="noaamonthreport.html">NOAA Month Report</a></li>
+                                <li><a href="noaayearreport.html">NOAA Year Report</a></li>
+                            </ul>
+                        </li>
                         <li class="dropdown active">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a>
                             <ul class="dropdown-menu">

diff --git a/interface/js/extrawebfiles.js b/interface/js/extrawebfiles.js
@@ -12,7 +12,7 @@
 // create our editable grid
 var editableGrid = new EditableGrid("DemoGridFull", {
 	enableSort: false, // true is the default, set it to false if you don't want sorting to be enabled
-	pageSize: 10
+	pageSize: 20
 });
 
 // helper function to get path of a demo image
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.exe
     *.exe.config
     *.pdb
+    updates.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Date (dd/mm/yy)\|Time\|Temperature1\|Temperature2\|Temperature3\|Temperature4\|Temperature5\|Temperature6\|Temperature7\|Temperature8\|Temperature9\|Temperature10\|Humidity1\|Humidity2\|Humidity3\|Humidity4\|Humidity5\|Humidity6\|Humidity7\|Humidity8\|Humidity9\|Humidity10\|Dew point1\|Dew point2\|Dew point3\|Dew point4\|Dew point5\|Dew point6\|Dew point7\|Dew point8\|Dew point9\|Dew point10\|Soil temp1\|Soil temp2\|Soil temp3\|Soil temp4\|Soil Moisture1\|Soil Moisture2\|Soil Moisture3\|Soil Moisture4\|Leaf temp1\|Leaf temp2\|Leaf wetness1\|Leaf wetness2