oak wilt formatting

uwent · Mar 25, 2024 · dd6d216 · dd6d216
1 parent 6f92f90
commit dd6d216
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/views/thermal_models/_oak_wilt_all_dds.html.erb b/app/views/thermal_models/_oak_wilt_all_dds.html.erb
@@ -9,8 +9,9 @@
     <table class="grid-table">
       <thead>
         <tr>
-          <th>Day</th>
+          <th></th>
           <th>Date</th>
+          <th>Day</th>
           <th>Min<br>temp<br>(&deg;F)</th>
           <th>Max<br>temp<br>(&deg;F)</th>
           <th>FDDs</th>
@@ -23,10 +24,11 @@
         <tr>
           <td><%= i + 1 %></td>
           <td><%= day[:date] %></td>
+          <td><%= Date.parse(day[:date])&.strftime("%b %-d") %></td>
           <td><%= fmt_temp(day[:min_temp]) %></td>
           <td><%= fmt_temp(day[:max_temp]) %></td>
-          <td><%= day[:value] %></td>
-          <td><%= day[:cumulative_value] %></td>
+          <td><%= sprintf("%.1f", day[:value]) %></td>
+          <td><%= sprintf("%.1f", day[:cumulative_value]) %></td>
           <td><%= day[:risk] %>
         </tr>
       <% end %>

diff --git a/app/views/thermal_models/oak_wilt_dd.html.erb b/app/views/thermal_models/oak_wilt_dd.html.erb
@@ -28,13 +28,11 @@
     <b>Location:</b> <%= @latitude %>&deg;N, <%= @longitude %>&deg;W (<%= link_to "show on Google maps", "https://www.google.com/maps/search/?api=1&query=#{@latitude},#{@longitude}", target: "_blank" %>)<br>
     <b>Date range:</b> January 1, <%= @end_date.strftime("%Y") %> to <%= @end_date.strftime("%B %d, %Y") %><br><br>
     <b>Degree day model:</b> Base 41&deg;F<br>
-    <b>Total degree days:</b> <%= @data.last[:cumulative_value] %> Fahrenheit degree days<br>
+    <b>Total degree days:</b> <%= sprintf("%.1f", @data.last[:cumulative_value]) %> Fahrenheit degree days<br>
     <b>Oak wilt high risk period:</b> 231 - 2172 degree days and date prior to July 15<br><br>
     <b>Predicted risk:</b> <%= @risk %>
   </p>
 
-  <br>
-
   <h3>Recommendation for <%= @end_date.strftime("%b %d, %Y") %>:</h3>
 
   <div style="margin-left: 2em; margin-right: 2em;">