decidim-conferences 0.19.0 → 0.22.0

data/app/jobs/decidim/conferences/admin/send_conference_diploma_job.rb

@@ -11,7 +11,7 @@ module Decidim
           return unless confirmed_registrations.any?
 
           confirmed_registrations.each do |registration_confirmed|
-            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_now
+            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_later
           end
         end
       end

data/app/models/decidim/conference.rb

@@ -16,6 +16,7 @@ module Decidim
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
+    include Decidim::Searchable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -55,6 +56,18 @@ module Decidim
     mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
     mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
+    searchable_fields({
+                        scope_id: :decidim_scope_id,
+                        participatory_space: :itself,
+                        A: :title,
+                        B: :slogan,
+                        C: :short_description,
+                        D: [:description, :objectives],
+                        datetime: :published_at
+                      },
+                      index_on_create: ->(_conference) { false },
+                      index_on_update: ->(conference) { conference.visible? })
+
     # Scope to return only the promoted conferences.
     #
     # Returns an ActiveRecord::Relation.
@@ -103,5 +116,17 @@ module Decidim
 
       end_date < Date.current
     end
+
+    def user_roles(role_name = nil)
+      roles = Decidim::ConferenceUserRole.where(conference: self)
+      return roles if role_name.blank?
+
+      roles.where(role: role_name)
+    end
+
+    # Allow ransacker to search for a key in a hstore column (`title`.`en`)
+    ransacker :title do |parent|
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    end
   end
 end

data/app/models/decidim/conference_user_role.rb

@@ -11,7 +11,7 @@ module Decidim
     belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference", optional: true
     alias participatory_space conference
 
-    ROLES = %w(admin collaborator moderator).freeze
+    ROLES = %w(admin collaborator moderator valuator).freeze
     validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :conference] }
     validate :user_and_conference_same_organization
 

data/app/permissions/decidim/conferences/permissions.rb

@@ -51,6 +51,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
+        valuator_action?
         conference_admin_action?
 
         permission_action
@@ -252,6 +253,14 @@ module Decidim
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
 
+      # Valuators can only read components
+      def valuator_action?
+        return unless can_manage_conference?(role: :valuator)
+
+        allow! if permission_action.action == :read && permission_action.subject == :component
+        allow! if permission_action.action == :export && permission_action.subject == :component_data
+      end
+
       # Process admins can eprform everything *inside* that conference. They cannot
       # create a conference or perform actions on conference groups or other
       # conferences.

data/app/presenters/decidim/conferences/conference_stats_presenter.rb

@@ -38,7 +38,7 @@ module Decidim
 
       def render_stats_data(component_manifest, name, data, index)
         safe_join([
-                    index.zero? ? manifest_icon(component_manifest) : " /&nbsp".html_safe,
+                    index.zero? ? manifest_icon(component_manifest, role: "img", "aria-hidden": true) : " /&nbsp".html_safe,
                     content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.conferences.statistics"),
                                 class: "#{name} process_stats-text")
                   ])

data/app/types/decidim/conferences/conference_media_link_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferenceMediaLinkType = GraphQL::ObjectType.define do
+      name "ConferenceMediaLink"
+      description "A conference media link"
+
+      field :id, !types.ID, "Internal ID for this media link"
+      field :title, Decidim::Core::TranslatedFieldType, "Title for this media link"
+      field :link, types.String, "URL for this media link"
+      field :date, Decidim::Core::DateType, "Relevant date for the media link"
+      field :weight, types.Int, "Order of appearance in which it should be presented"
+      field :createdAt, Decidim::Core::DateTimeType, "The time this entry was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this entry was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/conferences/conference_partner_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferencePartnerType = GraphQL::ObjectType.define do
+      name "ConferencePartner"
+      description "A conference partner"
+
+      field :id, !types.ID, "ID of the resource"
+      field :name, types.String, "Partner name"
+      field :partnerType, types.String, "Partner type", property: :partner_type
+      field :weight, types.Int, "Order of appearance in which it should be presented"
+      field :link, types.String, "Relevant URL for this partner"
+      field :logo, types.String, "Link to the partner's logo"
+      field :createdAt, Decidim::Core::DateTimeType, "The time this partner was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this partner was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/conferences/conference_speaker_type.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferenceSpeakerType = GraphQL::ObjectType.define do
+      name "ConferenceSpeaker"
+      description "A conference speaker"
+
+      field :id, !types.ID, "Internal ID of the speaker"
+      field :fullName, types.String, "Full name of the speaker", property: :full_name
+      field :position, Decidim::Core::TranslatedFieldType, "Position of the speaker in the conference"
+      field :affiliation, Decidim::Core::TranslatedFieldType, "Affiliation of the speaker"
+      field :twitterHandle, types.String, "Twitter handle", property: :twitter_handle
+      field :shortBio, Decidim::Core::TranslatedFieldType, "Short biography of the speaker", property: :short_bio
+      field :personalUrl, types.String, "Personal URL of the speaker", property: :personal_url
+      field :avatar, types.String, "Avatar of the speaker"
+      field :user, Decidim::Core::UserType, "Decidim user corresponding to this speaker", property: :user
+
+      field :createdAt, Decidim::Core::DateTimeType, "The time this member was created ", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this member was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/conferences/conference_type.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferenceType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface }
+      ]
+
+      name "Conference"
+      description "A conference"
+
+      field :id, !types.ID, "Internal ID for this conference"
+      field :shortDescription, Decidim::Core::TranslatedFieldType, "The short description of this conference", property: :short_description
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this conference"
+      field :slug, types.String, "The slug of this conference"
+      field :hashtag, types.String, "The hashtag for this conference"
+      field :slogan, Decidim::Core::TranslatedFieldType, "The slogan of the conference"
+      field :location, types.String, "The location of this conference"
+      field :createdAt, Decidim::Core::DateTimeType, "The time this conference was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this conference was updated", property: :updated_at
+      field :publishedAt, Decidim::Core::DateTimeType, "The time this conference was published", property: :published_at
+      field :reference, types.String, "Reference prefix for this conference"
+
+      field :heroImage, types.String, "The hero image for this conference", property: :hero_image
+      field :bannerImage, types.String, "The banner image for this conference", property: :banner_image
+      field :promoted, types.Boolean, "If this conference is promoted (therefore in the homepage)"
+      field :objectives, Decidim::Core::TranslatedFieldType, "The objectives of the conference"
+      field :showStatistics, types.Boolean, "If this conference shows the statistics", property: :show_statistics
+      field :startDate, Decidim::Core::DateType, "The date this conference starts", property: :start_date
+      field :endDate, Decidim::Core::DateType, "The date this conference ends", property: :end_date
+      field :registrationsEnabled, types.Boolean, "If the registrations are enabled in this conference", property: :registrations_enabled
+      field :availableSlots, types.Int, "The number of available slots in this conference", property: :available_slots
+      field :registrationTerms, Decidim::Core::TranslatedFieldType, "The registration terms of this conference", property: :registration_terms
+
+      field :speakers, types[Decidim::Conferences::ConferenceSpeakerType], "List of speakers in this conference"
+      field :partners, types[Decidim::Conferences::ConferencePartnerType], "List of partners in this conference"
+      field :categories, types[Decidim::Core::CategoryType], "List of categories in this conference"
+      field :mediaLinks, types[Decidim::Conferences::ConferenceMediaLinkType], "List of media links in this conference", property: :media_links
+    end
+  end
+end

data/app/views/decidim/conferences/_order_by_conferences.html.erb

@@ -1,3 +1,3 @@
 <div class="row collapse order-by">
-  <h2 class="order-by__text section-heading"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: collection.count) %></h2>
+  <h3 class="order-by__text section-heading"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: collection.count) %></h3>
 </div>

data/app/views/decidim/conferences/admin/conference_invites/index.html.erb

@@ -26,8 +26,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

data/app/views/decidim/conferences/admin/conference_speakers/index.html.erb

@@ -5,8 +5,8 @@
         <div class="input-group">
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>
@@ -63,6 +63,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conference_speakers, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb

@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conference_user_roles, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/conferences/index.html.erb

@@ -1,17 +1,18 @@
-<div class="card" id="conferences">
+<div class="card with-overflow" id="conferences">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.conferences" %>
       <%= link_to t("actions.new_conference", scope: "decidim.admin"), new_conference_path, class: "button tiny button--title" if allowed_to? :create, :conference %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t("models.conference.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.conference.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :created_at, t("models.conference.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="table-list__actions"><%= t("models.conference.fields.published", scope: "decidim.admin") %></th>
             <th></th>
           </tr>
@@ -22,11 +23,13 @@
               <td>
                 <% if conference.promoted? %>
                   <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.conference.fields.promoted", scope: "decidim.admin") %>">
-                    <%= icon "star" %>
+                    <%= icon "star", aria_label: t("models.conference.fields.promoted", scope: "decidim.admin"), role: "img" %>
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :conference, conference: conference %>
                   <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %><br>
+                <% elsif allowed_to? :read, :component, conference: conference %>
+                  <%= link_to translated_attribute(conference.title), components_path(conference) %><br>
                 <% elsif allowed_to? :preview, :conference, conference: conference %>
                   <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %><br>
                 <% elsif allowed_to? :read, :moderation, conference: conference %>
@@ -60,6 +63,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conferences, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/partners/index.html.erb

@@ -51,6 +51,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @partners, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/registration_types/index.html.erb

@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @registration_types, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/conference_program/_program_item.html.erb

@@ -8,10 +8,12 @@
           <ul class="tabs buttons__row" id="conference-row-<%= seed %>-tabs" data-tabs>
             <% categories.each_with_index do |category, i| %>
               <li class="tabs-title<%= " is-active" if i == 0 %>">
-                <!-- Wrap button in an anchor to make foundation tabs work -->
-                <a href="#conference-row-<%= seed %>-tab<%= i %>">
-                  <button class="button button--shadow secondary tiny light"><%= category.present? ? translated_attribute(category.name) : "other" %></button>
-                </a>
+                <!-- Wrap the anchor inside a div to keep correct button styling -->
+                <div>
+                  <a href="#conference-row-<%= seed %>-tab<%= i %>" class="button button--shadow tiny hollow">
+                    <%= category.present? ? translated_attribute(category.name) : "other" %>
+                  </a>
+                </div>
               </li>
             <% end %>
           </ul>

data/app/views/decidim/conferences/conference_program/show.html.erb

@@ -12,7 +12,7 @@ end
 <% add_decidim_meta_tags(title: t("conference_program.index.title", scope: "decidim")) %>
 <div class="section row">
   <div class="columns mediumlarge-12">
-    <h1 class="section-heading"><%= t(".program") %></h1>
+    <h3 class="section-heading"><%= t(".program") %></h3>
     <div class="conference-programme">
       <div class="row collapse programme-selector">
         <div class="column medium-2">
@@ -28,12 +28,12 @@ end
               data-tabs>
               <% meeting_days.each_with_index do |day, i| %>
                 <li class="tabs-title <%= "is-active" if i == 0 %>">
-                  <!-- Wrap button in an anchor to make foundation tabs work -->
-                  <a href="#conference-day-tab-<%= i %>">
-                    <button class="button button--nomargin button--sc secondary light">
+                  <!-- Wrap the anchor inside a div to keep correct button styling -->
+                  <div>
+                    <a href="#conference-day-tab-<%= i %>" class="button button--nomargin button--sc hollow">
                       <%= l day, format: :decidim_with_day_and_month_name %>
-                    </button>
-                  </a>
+                    </a>
+                  </div>
                 </li>
               <% end %>
             </ul>

data/app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb

@@ -3,7 +3,7 @@
 <p><%= t(".details_1", registration_type: translated_attribute(@registration_type.title), price: number_to_currency((@registration_type.price || 0), locale: I18n.locale, unit: Decidim.currency_unit)) %></p>
 
 <ul>
-  <% @registration_type.conference_meetings.each do |conference_meeting| %>
+  <% @registration_type.conference_meetings.order(:start_time).each do |conference_meeting| %>
     <li><%= present(conference_meeting).title %> </li>
   <% end %>
 </ul>

data/app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb

@@ -3,7 +3,7 @@
 <p><%= t(".details", registration_type: translated_attribute(@registration_type.title), price: number_to_currency((@registration_type.price || 0), locale: I18n.locale, unit: Decidim.currency_unit)) %></p>
 
 <ul>
-  <% @registration_type.conference_meetings.each do |conference_meeting| %>
+  <% @registration_type.conference_meetings.order(:start_time).each do |conference_meeting| %>
     <li><%= present(conference_meeting).title %> </li>
   <% end %>
 </ul>

data/app/views/decidim/conferences/conference_speakers/index.html.erb

@@ -11,7 +11,7 @@ edit_link(
 
 <section class="" id="conference_speakers-grid">
   <div class="row column">
-    <h2 class="section-heading"><%= t(".speakers") %></h2>
+    <h3 class="section-heading"><%= t(".speakers") %></h3>
     <div class="row small-up-2 medium-up-5 mb-l">
       <%= render(collection) %>
     </div>

data/app/views/decidim/conferences/conferences/_partners.html.erb

@@ -3,7 +3,7 @@
     <% conference.partners.group_by(&:partner_type).each do |partner_type, partners| %>
       <hr class="reset mt-none mb-m">
       <section class="section">
-        <h1 class="section-heading"><%= t(".#{partner_type.pluralize}") %></h1>
+        <h3 class="section-heading"><%= t(".#{partner_type.pluralize}") %></h3>
         <div class="row small-up-2 medium-up-3 card-grid">
           <% partners.each do |partner| %>
             <%= cell "decidim/conferences/partner", partner %>

data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb

@@ -1,4 +1,4 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
@@ -6,7 +6,7 @@
           <h2 class="card__title"><%= translated_attribute promoted_conference.title %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_conference.short_description), length: 630, separator: "...") %>
-        <%= link_to conference_path(promoted_conference), class: "button secondary small hollow card__button" do %>
+        <%= link_to conference_path(promoted_conference), class: "button small hollow card__button" do %>
           <%= t("conferences.promoted_conference.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -24,4 +24,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

data/app/views/decidim/conferences/conferences/show.html.erb

@@ -19,28 +19,24 @@ edit_link(
 <div class="row">
   <div class="columns mediumlarge-12">
     <section class="section">
-      <h4 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h4>
+      <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
       <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
     </section>
     <hr class="reset mt-none mb-m">
     <section class="section">
-      <h4 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h4>
+      <h3 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h3>
       <%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
       <div class="row mt-l mb-l">
         <div class="column medium-9 medium-centered">
           <% if current_participatory_space.registrations_enabled? %>
             <div class="column medium-6">
-              <%= link_to decidim_conferences.conference_registration_types_path(current_participatory_space) do %>
-                <button type="button" class="button button--sc light expanded"><%= t(".register") %></button>
-              <% end %>
+              <%= link_to t(".register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class:"button button--sc light expanded" %>
             </div>
           <% end %>
           <% current_participatory_space.components.where(manifest_name: "meetings").each do |component_meeting| %>
             <% if component_meeting.published? || component_meeting == self.try(:current_component) %>
               <div class="column medium-6 end">
-                <%= link_to decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id) do %>
-                  <button type="button" class="button button--sc secondary light expanded"><%= translated_attribute(component_meeting.name) %></button>
-                <% end %>
+                <%= link_to translated_attribute(component_meeting.name), decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id), class:"button button--sc secondary light expanded" %>
               </div>
             <% end %>
           <% end %>
@@ -55,15 +51,13 @@ edit_link(
     <% if current_participatory_space.registrations_enabled? %>
       <hr class="reset mt-none mb-m">
       <section class="section">
-        <h4 class="section-heading"><%= t(".register") %></h4>
+        <h3 class="section-heading"><%= t(".register") %></h3>
         <% if current_user.present? %>
           <div class="card p-m text-center">
             <p><%= t(".login_as", name: current_user.name, email: current_user.email ) %></p>
             <p><%= t(".make_conference_registration") %></p>
             <div class="medium-3" style="margin: 0 auto;">
-              <%= link_to decidim_conferences.conference_registration_types_path(current_participatory_space) do %>
-                <button type="button" class="button button--sc light expanded"><%= t(".register") %></button>
-              <% end %>
+              <%= link_to t(".register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class:"button button--sc light expanded" %>
             </div>
           </div>
         <% else %>
@@ -76,7 +70,7 @@ edit_link(
 
     <% unless translated_attribute(current_participatory_space.objectives).blank? %>
       <section class="section">
-        <h4 class="section-heading"><%= t("conferences.show.objectives", scope: "decidim") %></h4>
+        <h3 class="section-heading"><%= t("conferences.show.objectives", scope: "decidim") %></h3>
         <%= decidim_sanitize translated_attribute(current_participatory_space.objectives) %>
       </section>
     <% end %>