Browse Source

Also, removes Lake Temperature, including all n/a, then sorts by date. Row colors have been removed since n/a can't be predicted.

master
Jonathan Rosenbaum 11 months ago
parent
commit
4af9802fff
  1. 45
      public/class-water-the-theme-public.php
  2. 4
      public/js/water-the-theme-public.js

45
public/class-water-the-theme-public.php

@ -20,7 +20,8 @@
* @subpackage Water_The_Theme/public * @subpackage Water_The_Theme/public
* @author Jonathan Rosenbaum <gnuser@gmail.com> * @author Jonathan Rosenbaum <gnuser@gmail.com>
*/ */
class Water_The_Theme_Public { class Water_The_Theme_Public
{
/** /**
* The ID of this plugin. * The ID of this plugin.
@ -47,11 +48,11 @@ class Water_The_Theme_Public {
* @param string $plugin_name The name of the plugin. * @param string $plugin_name The name of the plugin.
* @param string $version The version of this plugin. * @param string $version The version of this plugin.
*/ */
public function __construct( $plugin_name, $version ) { public function __construct($plugin_name, $version)
{
$this->plugin_name = $plugin_name; $this->plugin_name = $plugin_name;
$this->version = $version; $this->version = $version;
} }
/** /**
@ -59,7 +60,8 @@ class Water_The_Theme_Public {
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function enqueue_styles() { public function enqueue_styles()
{
/** /**
* This function is provided for demonstration purposes only. * This function is provided for demonstration purposes only.
@ -74,7 +76,6 @@ class Water_The_Theme_Public {
*/ */
wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__) . 'css/water-the-theme-public.css', array(), $this->version, 'all'); wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__) . 'css/water-the-theme-public.css', array(), $this->version, 'all');
} }
/** /**
@ -82,7 +83,8 @@ class Water_The_Theme_Public {
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function enqueue_scripts() { public function enqueue_scripts()
{
/** /**
* This function is provided for demonstration purposes only. * This function is provided for demonstration purposes only.
@ -97,10 +99,10 @@ class Water_The_Theme_Public {
*/ */
wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/water-the-theme-public.js', array('jquery'), $this->version, false); wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/water-the-theme-public.js', array('jquery'), $this->version, false);
} }
public function water_the_theme($thePage) { public function water_the_theme($thePage)
{
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->loadHTML($thePage); $doc->loadHTML($thePage);
@ -164,7 +166,6 @@ class Water_The_Theme_Public {
$nws_custom = Water_The_Theme_Public::nws_custom($att); $nws_custom = Water_The_Theme_Public::nws_custom($att);
$thePage .= $nws_custom; $thePage .= $nws_custom;
} // end Timely Information } // end Timely Information
// Statics Page - last 5 lake data // Statics Page - last 5 lake data
@ -181,6 +182,7 @@ class Water_The_Theme_Public {
$datetime = (string)$div->attributes()->datetime; $datetime = (string)$div->attributes()->datetime;
list($sitename, $parameter) = explode(' ', $class); list($sitename, $parameter) = explode(' ', $class);
$sitename = ucwords(preg_replace('/_/', ' ', $sitename)); $sitename = ucwords(preg_replace('/_/', ' ', $sitename));
$parameter = ucwords(preg_replace('/_/', ' ', $parameter)); $parameter = ucwords(preg_replace('/_/', ' ', $parameter));
@ -205,13 +207,31 @@ class Water_The_Theme_Public {
if ($sitename === 'Tail Race Level') { if ($sitename === 'Tail Race Level') {
$value = (float)$value + 776.63; $value = (float)$value + 776.63;
} }
if ($value !== 'n/a') {
$statistics[] = "<tr><td>$sitename $parameter</td><td>$value</td><td datetime='$datetime'></td></tr>"; $statistics[] = "<tr><td>$sitename $parameter</td><td>$value</td><td datetime='$datetime'></td></tr>";
}
//PC::debug($value . " " . $sitename . " " . $parameter); //PC::debug($value . " " . $sitename . " " . $parameter);
} // end foreach } // end foreach
list($array1, $array2, $array3) = array_chunk($statistics, ceil(count($statistics) / 3));
usort($statistics, function ($a, $b) {
preg_match('/datetime=\'(\d+)\'/', $a, $matchesA);
preg_match('/datetime=\'(\d+)\'/', $b, $matchesB);
$dateTimeA = isset($matchesA[1]) ? (int)$matchesA[1] : 0;
$dateTimeB = isset($matchesB[1]) ? (int)$matchesB[1] : 0;
return $dateTimeB - $dateTimeA;
});
// highlight_string(var_export($statistics, true));
list($array1, $array2, $array3) = array_chunk($statistics, ceil(count($statistics) / 1));
// highlight_string(var_export($array1, true));
foreach ($array1 as $key => $value) { foreach ($array1 as $key => $value) {
$thePage .= $array2[$key]; $thePage .= $array2[$key];
$thePage .= $array3[$key]; $thePage .= $array3[$key];
$thePage .= $value; $thePage .= $value;
@ -223,10 +243,10 @@ class Water_The_Theme_Public {
$thePage .= '</table>'; $thePage .= '</table>';
return $thePage; return $thePage;
} // function water the theme } // function water the theme
public function nws_custom( $att ) { public function nws_custom($att)
{
list($name, $location, $parameters, $date_range, $order) = [ list($name, $location, $parameters, $date_range, $order) = [
@ -294,7 +314,6 @@ class Water_The_Theme_Public {
//$thePage .= "<tr><td>Tail Water Flow</td><td>$waterflow</td><td datetime='$datetime'></td></tr>"; //$thePage .= "<tr><td>Tail Water Flow</td><td>$waterflow</td><td datetime='$datetime'></td></tr>";
} }
$c++; $c++;
} // foreach xml_tree as site data } // foreach xml_tree as site data
} // foreach NWS location } // foreach NWS location

4
public/js/water-the-theme-public.js

@ -32,8 +32,8 @@
$( window ).load(function() { $( window ).load(function() {
// #BED8D3' '#D8E4E6' // #BED8D3' '#D8E4E6'
$('#Statistics tr:nth-child(6n), #Statistics tr:nth-child(6n-1), #Statistics tr:nth-child(6n-2)').css({backgroundColor:'#D8E4E6'}); // $('#Statistics tr:nth-child(6n), #Statistics tr:nth-child(6n-1), #Statistics tr:nth-child(6n-2)').css({backgroundColor:'#D8E4E6'});
$('#Statistics tr:nth-child(6n-3), #Statistics tr:nth-child(6n-4), #Statistics tr:nth-child(6n-5)').css({backgroundColor:'#BED8D3'}); // $('#Statistics tr:nth-child(6n-3), #Statistics tr:nth-child(6n-4), #Statistics tr:nth-child(6n-5)').css({backgroundColor:'#BED8D3'});
$("td[datetime]").each(function(key,value){ $("td[datetime]").each(function(key,value){
var dt = $(value).attr('datetime'); var dt = $(value).attr('datetime');

Loading…
Cancel
Save