trusty-festivity-extension 2.4.6 → 2.5.0

data/app/controllers/search_controller.rb

@@ -1,6 +1,5 @@
 class SearchController < ApplicationController
-  no_login_required
-  trusty_layout 'base'
+  include Concerns::FestivityCustomPage
 
   def show
     query = params[:q].to_s

data/app/helpers/festivity_events_helper.rb

@@ -9,4 +9,29 @@ module FestivityEventsHelper
     performances.map {|perf| "<li>#{perf.start_date.strftime('%A, %B %d')}, #{perf.start_date.strftime('%I:%M %p').downcase} - #{perf.end_date.strftime('%I:%M %p').downcase}</li>" }.join("")
   end
 
-end
+  def social_share_message(production)
+    "Check out #{production.title} for #{fest_hashtag} @ #{production.locations.first.title}!"
+  end
+
+  def social_share_email_subject(production)
+    "Check out #{production.title}"
+  end
+
+  def social_share_email_message(production)
+    "I thought you might be interested in seeing #{production.title}."
+  end
+
+  def shared_production_url
+    "#{event_url}?cid=CDSocial"
+  end
+
+  def fest_hashtag
+    if @event.site_id == 3
+      "#TRAF"
+    elsif @event.site_id == 2
+      "#PGHkids"
+    end
+
+  end
+
+end

data/app/models/concerns/festivity_artist_methods.rb

@@ -0,0 +1,28 @@
+module Concerns
+  module FestivityArtistMethods
+
+    include ActiveSupport::Concern
+
+    def has_social?
+      (has_twitter? or has_facebook? or has_homepage? or has_instagram?)
+    end
+
+    def has_twitter?
+      !self.artist_twitter.empty?
+    end
+
+    def has_facebook?
+      !self.artist_facebook.empty?
+    end
+
+    def has_instagram?
+      !self.artist_instagram.empty?
+    end
+
+    def has_homepage?
+      !self.artist_homepage.empty?
+    end
+
+
+  end
+end

data/app/models/festivity_event_list.rb

@@ -1,5 +1,7 @@
 class FestivityEventList
 
+  include Concerns::FestivitySqlBuilder
+
   attr_reader :events
 
   def initialize(event_performances)
@@ -27,11 +29,18 @@ class FestivityEventList
     )
   end
 
-  def self.find_by_location(location_id)
+  def self.find_by_location(location_id, site)
+    begin
+      where_clause = parse_criteria(dates: collect_festival_dates(site).join(","), filter_type: site.festivity_filter_type)
+    rescue ActiveRecord::RecordNotFound
+      return FestivityEventList.new([])
+    end
+
     FestivityEventList.new(
         FestivityEventList::FestivityEventPerformance.
             includes(:assets).
             joins(:festivity_categories).
+            where(where_clause).
             where(location_id: location_id).
             group("performance_id").
             order("featured_item DESC, start_date ASC").
@@ -53,6 +62,16 @@ class FestivityEventList
     )
   end
 
+  def self.collect_festival_dates(site)
+    festival_dates = site.festival_datetimes
+    if site.date_during_festival?(Time.now)
+      festival_dates = festival_dates.select{ |date| date.datetime == Time.now }
+    end
+
+    festival_dates.map{ |date| date.to_s }
+
+  end
+
   private
 
   # Return a list of unique event ids that match the provided dates
@@ -63,6 +82,7 @@ class FestivityEventList
   # Create a condition for start and end date between midnight and 11:59pm
   # for each date passed in and return the SQL condition
   def self.datetime_criteria(datetimes_string, filter_type)
+
     date_queries = datetimes_string.split(',').map do |date_string|
       start_date = Chronic.parse(URI.decode(date_string)).utc
       end_date = start_date.advance(advance_by(filter_type))
@@ -77,11 +97,6 @@ class FestivityEventList
     date_queries.join(" OR ")
   end
 
-  def self.advance_by(filter_type)
-    advance_by_hash = {minutes: 59}
-    advance_by_hash[:hours] = 23 if filter_type == "date"
-    advance_by_hash
-  end
 
   # The order of querying, depending on what is passed:
   # - If dates are passed, we search both start and end date between midnight and 11:59pm of that date.
@@ -100,15 +115,6 @@ class FestivityEventList
     where_clause
   end
 
-  def self.parse_categories(category_ids)
-    grouped_ids = FestivityCategory.find(category_ids).group_by {|category| category.festivity_category_type}
-    category_clauses = grouped_ids.map do |categories|
-      "page_id IN (SELECT page_id FROM festivity_page_categories WHERE festivity_category_id IN (#{categories[1].map {|category| category.id}.join(",")}))"
-    end
-    "(#{category_clauses.join(" AND ")})"
-
-  end
-
 
 end
 

data/app/models/festivity_event_page.rb

@@ -3,6 +3,8 @@ class FestivityEventPage < FestivityBasePage
   has_many :festivity_page_categories, foreign_key: :page_id
   has_many :festivity_categories, through: :festivity_page_categories
 
+  include Concerns::FestivityArtistMethods
+
   def festivity_performances=(performances)
     performances.each do |performance|
       performance_id = performance.delete(:performance_id)
@@ -26,26 +28,6 @@ class FestivityEventPage < FestivityBasePage
     !self.buy_url.empty?
   end
 
-  def has_social?
-    (has_twitter? or has_facebook? or has_homepage? or has_instagram?)
-  end
-
-  def has_twitter?
-    !self.artist_twitter.empty?
-  end
-
-  def has_facebook?
-    !self.artist_facebook.empty?
-  end
-
-  def has_instagram?
-    !self.artist_instagram.empty?
-  end
-
-  def has_homepage?
-    !self.artist_homepage.empty?
-  end
-
   def event_locations
     # Return array of unique locations
     self.performances.
@@ -54,4 +36,4 @@ class FestivityEventPage < FestivityBasePage
   end
 
 
-end
+end

data/app/models/festivity_market_list.rb

@@ -0,0 +1,76 @@
+class FestivityMarketList
+
+  include Concerns::FestivitySqlBuilder
+
+  attr_reader :markets
+
+
+  def initialize(market_details)
+    @markets = market_details
+  end
+
+  def self.search(criteria, order_by)
+    begin
+      where_clause = parse_criteria(criteria)
+    rescue ActiveRecord::RecordNotFound
+      return FestivityMarketList.new([])
+    end
+
+    # where in market ids
+    FestivityMarketList.new(
+      FestivityMarketList::FestivityMarketDetail.
+        includes(:assets).
+        joins(:festivity_categories).
+        where(where_clause).
+        order("#{order_by} ASC").
+        preload(:festivity_categories)
+    )
+  end
+
+
+  private
+
+
+  # Return a list of unique market ids that match the provided dates
+  def self.market_ids_for_datetimes(datetimes, filter_type)
+    FestivityMarketList::FestivityMarketDetail.where(datetime_criteria(datetimes, filter_type)).map {|e| e.market_id}.uniq
+  end
+
+  # Create a condition for start and end date between midnight and 11:59pm
+  # for each date passed in and return the SQL condition
+  def self.datetime_criteria(datetimes_string, filter_type)
+
+    date_queries = datetimes_string.split(',').map do |date_string|
+      start_date = Chronic.parse(URI.decode(date_string)).utc
+      end_date = start_date.advance(advance_by(filter_type))
+      <<-SQL
+        (
+          (start_date <= '#{start_date}' AND end_date >= '#{end_date}')
+          OR
+          (end_date >= '#{start_date}' AND start_date <= '#{end_date}')
+        )
+      SQL
+    end
+    date_queries.join(" OR ")
+  end
+
+
+  # The order of querying, depending on what is passed:
+  # - If dates are passed, we search both start and end date between midnight and 11:59pm of that date.
+  #   That query returns any matching market ids.
+  # - The market ids returned, if any, are added to the where clause for the next query
+  # - Any category ids passed are added to the where clause as well.
+
+  def self.parse_criteria(criteria)
+    if criteria[:dates]
+      market_ids = market_ids_for_datetimes(criteria[:dates], criteria[:filter_type])
+      raise ActiveRecord::RecordNotFound unless market_ids.any?
+    end
+
+    where_clause = "site_id = #{ Page.current_site.id}"
+    where_clause += " AND market_id IN (#{market_ids.join(",")})" if market_ids.present?
+    where_clause += " AND #{parse_categories(criteria[:categories].split(","))}" if criteria[:categories]
+    where_clause
+  end
+
+end

data/app/models/festivity_market_list/festivity_market_detail.rb

@@ -0,0 +1,24 @@
+class FestivityMarketList::FestivityMarketDetail < ActiveRecord::Base
+  self.table_name = 'festivity_market_details'
+  after_initialize :readonly!
+
+  has_many :festivity_page_categories, foreign_key: :page_id, primary_key: :market_id
+  has_many :festivity_categories, through: :festivity_page_categories
+  has_many :page_attachments, primary_key: :market_id, foreign_key: :page_id
+  has_many :assets, through: :page_attachments
+
+
+  def id
+    market_id
+  end
+
+  def categories
+    festivity_categories
+  end
+
+  def image
+    image = assets.select { |asset| asset.title == "featured_image" }.first if assets.size > 0
+    image.thumbnail(:normal) unless image.nil?
+  end
+
+end

data/app/models/festivity_market_page.rb

@@ -1,3 +1,10 @@
 class FestivityMarketPage < FestivityBasePage
 
+  include Concerns::FestivityArtistMethods
+  has_many :festivity_categories, through: :festivity_page_categories
+
+  def area
+    FestivityLocationAreaPage.find(area_id)
+  end
+
 end

data/app/views/admin/pages/_festivity_base_fields.html.haml

@@ -7,6 +7,10 @@
     %label{for: "page_short_description"}
       Short Description
     = self.text_area( :page, :short_description, class: "textbox festivity-control", rows: 4)
+  %p.festivity-third
+    %label{for: "page_featured_item"}
+      Do Not Show In Sub-Navigation
+    = self.check_box( :page, :hide_from_subnav, class: "textbox festivity-control")
 
 - if @page.is_a?(FestivityBasePage) && @page.id
 
@@ -17,8 +21,9 @@
   - if @page.status_id == Status[:published].id
     %p.festivity-full
       View page:
-      = link_to "http://#{@page.site.base_domain}#{event_path(@page)}" do
-        = "http://#{@page.site.base_domain}#{event_path(@page)}"
+      - path = @page.is_a?(FestivityMarketPage) ? market_path(@page) : event_path(@page)
+      = link_to "http://#{@page.site.base_domain}#{path}" do
+        = "http://#{@page.site.base_domain}#{path}"
   %p.festivity-full
     %label{for: "page_short_description"}
       Short Description
@@ -35,10 +40,11 @@
     %label{for: "page_featured_item"}
       Featured
     = self.check_box( :page, :featured_item, class: "textbox festivity-control")
-  %p.festivity-third
-    %label{for: "page_buy_url"}
-      Buy Tickets URL
-    = self.text_field( :page, :buy_url, class: "textbox festivity-control")
+  - if @page.is_a?(FestivityEventPage)
+    %p.festivity-third
+      %label{for: "page_buy_url"}
+        Buy Tickets URL
+      = self.text_field( :page, :buy_url, class: "textbox festivity-control")
 
   .festivity-div.festivity-title
     %h4
@@ -66,7 +72,24 @@
         %span{class: "fa fa-wrench fa-lg", aria: {hidden: "true"}}
         Performances
     = render partial: "admin/pages/partials/performances", locals: {performances: @page.festivity_performances, page_id: @page.id}
-
+  - if @page.is_a?(FestivityMarketPage)
+    - areas = FestivityLocationAreaPage.where(site_id: @page.site.id)
+    %p.festivity-third
+      %label{for: "page_market_start_date"}
+        Start Date
+      = self.text_field :page, :market_start_date, :class=> "date_field textbox date festivity-control", :value => (@page.market_start_date ? format_date(@page.market_start_date) : nil)
+    %p.festivity-third
+      %label{for: "page_market_end_date"}
+        End Date
+      = self.text_field :page, :market_end_date, :class=> "date_field textbox date festivity-control", :value => (@page.market_end_date ? format_date(@page.market_end_date) : nil)
+    %p.festivity-third
+      %label{for: "page_booth_number"}
+        Booth Number
+      = self.text_field(:page, :booth_number, class: "textbox festivity-control")
+    %p.festivity-third
+      %label{for: "page_booth_number"}
+        Area
+      = self.select :page, :area_id,  options_from_collection_for_select(areas, "id", "title", @page.area_id), :class=> "textbox festivity-control"
 
   .festivity-div.festivity-title
     %h4

data/app/views/festivity_events/_filters.html.haml

@@ -20,7 +20,7 @@
               %label{for: datetime.to_s}
                 %input.input-checkbox{type: "checkbox", id: datetime.to_s, value: datetime.to_s, checked: checked,  data: {filter: "Date", sort: datetime.to_s}}
                 = datetime.display
-    - current_site.festivity_active_category_types.each do |type|
+    - current_site.festivity_active_category_types_for("FestivityEventPage").each do |type|
       .filter-type.toggler-root
         %h4.filter-category.toggler-trigger{aria: {expanded: "false", controls: 'filters-list'}}
           %span.category-text

data/app/views/festivity_events/show.html.haml

@@ -1,3 +1,5 @@
+= javascript_include_tag "modal"
+
 %header.page-header
   %h1.page-title
     = @event.title
@@ -33,10 +35,10 @@
           %li
             %a{target: "_blank", href: "#{@event.locations.first.festivity_directions_url}"}
               Get Directions
-          -# TODO: Get the modal working.
-          -#%li
-          -#  %a{href: "#", data: {toggle:"modal", target:"#share-modal"}}
-          -#    Share This
+        %li
+          %a.modal-link{href: "#"}
+            Share This
+        = render partial: 'social/share_modal', locals: {event_page: @event, url: shared_production_url}
 
   %aside.secondary-content
     - if @event.can_buy?

data/app/views/festivity_markets/_filters.html.haml

@@ -0,0 +1,46 @@
+- current_date = FestivityDatetimePresenter.new current_site.festival_datetimes.first.datetime - 1.day
+%section.filters-wrapper
+  %h3.title Filters
+  %form.filters{:action => "#"}
+    .filter-type.toggler-root
+      %h4.filter-category.toggler-trigger{aria: {expanded: "false", controls: 'filters-list'}}
+        %span.category-text
+          Dates
+        %span.icon-chevron-down{:data => {'grunticon-embed' => true}}
+        %span.visually-hidden
+          Open/Close Filters
+      .toggler-content.filters-list{aria: {hidden: "true"}}
+        %ul.date-filters
+          - current_site.festival_datetimes.each do |datetime|
+            - checked = selected_dates.any? {|selected_date| selected_date == datetime}
+            %li
+              %label{for: datetime.to_s}
+                %input.input-checkbox{type: "checkbox", id: datetime.to_s, value: datetime.to_s, checked: checked,  data: {filter: "Date", sort: datetime.to_s}}
+                = datetime.display
+    - current_site.festivity_active_category_types_for("FestivityMarketPage").each do |type|
+      .filter-type.toggler-root
+        %h4.filter-category.toggler-trigger{aria: {expanded: "false", controls: 'filters-list'}}
+          %span.category-text
+            = type.name
+          %span.icon-chevron-down{:data => {'grunticon-embed' => true}}
+          %span.visually-hidden
+            Open/Close Filters
+        .toggler-content.filters-list{aria: {hidden: "true"}}
+          %ul.category-filters
+            - type.parent_categories.each do |parent|
+              - checked = selected_categories.include? parent.id.to_s
+              %li
+                %label{for: parent.id}
+                  %input.input-checkbox{type: "checkbox", id: parent.id, value: parent.id, data: {filter: type.name, sort: parent.name.downcase}, checked: checked}
+                  = parent.name
+
+                - if parent.children.any?
+                  %ul
+                    - parent.children.each do |child|
+                      - checked = selected_categories.include? child.id.to_s
+                      %li
+                        %label{for: child.id}
+                          %input.input-checkbox{type: "checkbox", id: child.id, value: child.id, data: {filter: type.name, sort: child.name.downcase}, checked: checked}
+                          = child.name
+    %a.cancel-filters Cancel
+    %a.submit-filters Filter

data/app/views/festivity_markets/_market.html.haml

@@ -0,0 +1,40 @@
+- show_dates ||= false
+
+%article.event
+  - if market.image
+    .event-media
+      = image_tag market.image
+      - if market.featured_item
+        %span.is-featured
+          Featured Event!
+
+  .event-body
+    %h3.event-title
+      = link_to market_path(market.id) do
+        = market.market_title
+    - if market.header
+      %h4.event-subtitle
+        = market.header
+        - if market.sub_header
+          = market.sub_header
+
+    .event-location
+      = link_to area_path(id: market.area_slug) do
+        = market.area_title
+
+    - if show_dates
+      .event-date
+        %span.time
+          = market.start_date.strftime("%A, %B %d")
+          = " - "
+          = market.end_date.strftime("%A, %B %d")
+
+    .event-description
+      %p
+        %span.event-genre
+          = market.categories.first.name
+        = market.short_description
+    .event-tags-group
+      %ul.event-tags
+        %li
+          = link_to "Details", market_path(market.id)