[whimsy] branch master updated: add rotate and am/pm

[rubys]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new f009ea4  add rotate and am/pm
f009ea4 is described below

commit f009ea444a6ba0678fc9f5b49caf7018758a5f7a
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Apr 14 10:28:40 2020 -0400

    add rotate and am/pm
---
 www/board/calendar.cgi | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/www/board/calendar.cgi b/www/board/calendar.cgi
index a94cb69..29a2803 100755
--- a/www/board/calendar.cgi
+++ b/www/board/calendar.cgi
@@ -23,27 +23,31 @@ _html do
   @time ||= '21:30'
   @zone ||= 'UTC'
   base = TZInfo::Timezone.get(@zone)
+  rotate = (@rotate || 0).to_i
 
   _h2 'Proposed board meeting times'
 
   _p %{
     Future meeting times, presuming that the time of the meeting is
-    set to #{@time} #{@zone}.
+    set to #{@time} #{@zone}, rotating each meeting time by #{rotate} hours.
   }
   
-  _p.bg_danger %{
-    This background color indicate a local time change from the previous
-    month.
-  }
+  if rotate == 0
+    _p.bg_danger %{
+      This background color indicate a local time change from the previous
+      month.
+    }
+  end
   
   _table.table do
     _thead do
      _tr do
        _th
+       _th 'UTC' if rotate != 0
        _th 'Los Angeles'
        _th 'New York'
        _th 'Brussels'
-       _th 'Kuala Lumpur '
+       _th 'Kuala Lumpur'
        _th 'Sydney'
      end
     end
@@ -52,13 +56,20 @@ _html do
       date = Date.parse(date)
       next if date < Date.today
 
-      time = base.local_to_utc(Time.parse("#{date}/#{@time}"))
+      time = base.local_to_utc(Time.parse("#{date}T#{@time}"))
+      @time = (time + rotate.hour).strftime("%H:%M")
 
       _tr do
         _td date
+        _td time.strftime('%H:%M') if rotate != 0
         zones.each do |zone|
-          local = time.in_time_zone(zone).strftime("%H:%M")
-          if prev[zone] != local and prev[zone]
+          if zone.to_s.include? 'Asia' or zone.to_s.include? 'Europe'
+            local = time.in_time_zone(zone).strftime("%H:%M")
+          else
+            local = time.in_time_zone(zone).strftime("%-I:%M%P")
+          end
+
+          if prev[zone] != local and prev[zone] and rotate == 0
             _td.bg_danger local
           else
             _td local