whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch master updated: Use better last event date
Date Sat, 22 Apr 2017 17:07:25 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru 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  a644463   Use better last event date
a644463 is described below

commit a64446361f4ec95837ca87f7bd361ee9a67e93b9
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Sat Apr 22 13:07:20 2017 -0400

    Use better last event date
---
 www/test/conferences.cgi | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/www/test/conferences.cgi b/www/test/conferences.cgi
index 5efca1e..aa94f19 100755
--- a/www/test/conferences.cgi
+++ b/www/test/conferences.cgi
@@ -6,6 +6,7 @@ require 'wunderbar'
 require 'wunderbar/bootstrap'
 require 'wunderbar/jquery/stupidtable'
 require 'whimsy/asf/themes'
+require 'date'
 
 PAGETITLE = 'FOSS Conference Listings'
 
@@ -21,10 +22,10 @@ _html do
             _div.panel_heading {_h3.panel_title 'FOSS Conference Listings'}
             _div.panel_body do
               _ 'Listing various self-reported FOSS Conferences and their claimed speaker
support status.  Data from '
-              _a 'afilina/dev-community-data', href: 'https://github.com/afilina/dev-community-data/'
+              _a_ 'afilina/dev-community-data', href: 'https://github.com/afilina/dev-community-data/'
               _ ', calendar website at '
-              _a 'ConFoo Community', href: 'https://community.confoo.ca/'
-              _ '.  Click to sort table.'
+              _a_ 'ConFoo Community', href: 'https://community.confoo.ca/'
+              _ '.  Click to sort table.  "False" propercase entries are when conference
doesn\'t report any speaker reimbursement details.' 
             end
           end
         end
@@ -67,7 +68,12 @@ _html do
                 _td 'False'
                 _td 'False'
               end
-              _td conf['last_event']
+              if conf['events'] then
+                laste = conf['events'].max_by {|e| Date.parse(e['event_end'])}
+                _td laste['event_end']
+              else
+                _td conf['last_event']
+              end
               _td do 
                 _a conf['twitter'], href: conf['twitter']
               end

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message