decidim-conferences 0.15.2 → 0.16.0

data/app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb

@@ -11,6 +11,10 @@ module Decidim
             name: resource.user.name,
             email: resource.user.email
           },
+          registration_type: {
+            title: resource.registration_type.title,
+            price: resource.registration_type.price
+          },
           conference: {
             title: resource.conference.title,
             reference: resource.conference.reference,

data/app/uploaders/decidim/conferences/diploma_uploader.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This class deals with uploading the conference partner logo.
+    class DiplomaUploader < ImageUploader
+      version :thumb do
+        process resize_to_fit: [275, 90]
+      end
+    end
+  end
+end

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

@@ -25,6 +25,14 @@
         end %>
     </div>
   </div>
+  <div class="grid-x grid-margin-x">
+    <div class="auto cell">
+      <%= form.select :registration_type_id,
+                      options_for_select(@form.registration_types_for_select),
+                      { include_blank: false },
+                      { multiple: false, class: "chosen-select" } %>
+    </div>
+  </div>
 </div>
 
 <%= javascript_include_tag "decidim/conferences/admin/conference_invite_form" %>

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

@@ -53,6 +53,7 @@
             <th><%= t("models.conference_invite.fields.email", scope: "decidim.conferences") %></th>
             <th><%= t("models.conference_invite.fields.sent_at", scope: "decidim.conferences") %></th>
             <th><%= t("models.conference_invite.fields.status", scope: "decidim.conferences") %></th>
+            <th><%= t("models.conference_invite.fields.registration_type", scope: "decidim.conferences") %></th>
           </tr>
         </thead>
         <tbody>
@@ -73,6 +74,9 @@
               <td class="<%= presenter.status_html_class %>">
                 <%= presenter.status %>
               </td>
+              <td>
+                <%= translated_attribute(invite.registration_type.title) %>
+              </td>
             </tr>
           <% end %>
         </tbody>

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

@@ -22,6 +22,9 @@
           <tr>
             <th><%= t("models.conference_registration.fields.name", scope: "decidim.conferences") %></th>
             <th><%= t("models.conference_registration.fields.email", scope: "decidim.conferences") %></th>
+            <th><%= t("models.conference_registration.fields.registration_type", scope: "decidim.conferences") %></th>
+            <th><%= t("models.conference_registration.fields.state", scope: "decidim.conferences") %></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
@@ -33,6 +36,19 @@
               <td>
                 <%= registration.user.email %>
               </td>
+              <td>
+                <%= translated_attribute(registration.registration_type.title) %>
+              </td>
+              <td>
+                <%= t("models.conference_registration.fields.states.#{registration.confirmed? ? "confirmed" : "pending"}", scope: "decidim.conferences") %>
+              </td>
+              <td>
+                <% if allowed_to?(:confirm, :conference_registration, conference_registration: registration) %>
+                  <% if !registration.confirmed? %>
+                    <%= icon_link_to "check", confirm_conference_conference_registration_path(current_conference, registration), t("actions.confirm", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
+                  <% end %>
+                <% end %>
+              </td>
             </tr>
           <% end %>
         </tbody>

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

@@ -10,9 +10,5 @@
         <%= link_to t("actions.publish", scope: "decidim.admin"), conference_publish_path(current_conference), method: :post, class: "button hollow" %>
       <% end %>
     <% end %>
-
-    <% if allowed_to? :destroy, :conference, conference: current_conference %>
-      <%= link_to t("decidim.admin.actions.destroy"), current_conference, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
-    <% end %>
   </div>
 <% end %>

data/app/views/decidim/conferences/admin/diplomas/_form.html.erb

@@ -0,0 +1,31 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+      <% if allowed_to?(:send_diplomas, :conference, conference: current_participatory_space ) && current_participatory_space.sign_date.present? && current_participatory_space.conference_registrations.confirmed.any? %>
+        <%= link_to t("actions.send_diplomas", scope: "decidim.admin"), send_conference_diploma_path(current_conference), method: :post, id: "send-diplomas", class: "button tiny button--title new #{"disabled" if current_participatory_space.diploma_sent? }" %>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row">
+      <div class="columns xlarge-6">
+        <%= form.upload :main_logo, optional: false %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="columns xlarge-6">
+        <%= form.upload :signature, optional: false %>
+      </div>
+    </div>
+    <div class="row column">
+      <%= form.date_field :sign_date %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :signature_name %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/conferences/admin/diplomas/edit.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: conference_diploma_path, html: { class: "form edit_conference_diploma" })  do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("diplomas.edit.title", scope: "decidim.conferences.admin") } %>
+
+   <div class="button--double form-general-submit">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>

data/app/views/decidim/conferences/admin/invite_join_conference_mailer/invite.html.erb

@@ -5,8 +5,8 @@
 </p>
 
 <p>
-  <%= link_to t(".decline", conference_title: translated_attribute(@conference.title)),routes.decline_invitation_conference_conference_registration_path(conference_slug: @conference.slug) %>
+  <%= link_to t(".decline", conference_title: translated_attribute(@conference.title)),routes.decline_invitation_conference_registration_type_conference_registration_path(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
 </p>
 <p>
-  <%= link_to t(".join", conference_title: translated_attribute(@conference.title)),routes.conference_conference_registration_url(conference_slug: @conference.slug) %>
+  <%= link_to t(".registration", conference_title: translated_attribute(@conference.title)),routes.conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
 </p>

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

@@ -0,0 +1,30 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+
+    <div class="row column">
+      <%= form.number_field :weight %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description %>
+    </div>
+
+    <div class="row column">
+      <%= form.number_field :price %>
+    </div>
+
+    <div class="row column">
+      <%= form.label t(".select_conference_meetings") %>
+      <%= form.collection_check_boxes :conference_meeting_ids, @form.meetings, :value, :title, legend_title: "" %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: conference_registration_type_path(@registration_type.conference, @registration_type), html: { class: "form edit_registration_type" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("registration_types.edit.title", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+  <%= f.submit t("registration_types.edit.update", scope: "decidim.admin") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,65 @@
+<div class='card' id="registration_types">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <% if allowed_to? :create, :registration_type %>
+         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.registration_type.name", scope: "decidim.admin")), new_conference_registration_type_path(current_conference), class: "button tiny button--title new" %>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="stack">
+        <thead>
+          <tr>
+            <th><%= t("models.registration_type.fields.title", scope: "decidim.admin") %></th>
+            <th><%= t("models.registration_type.fields.price", scope: "decidim.admin") %></th>
+            <th><%= t("models.registration_type.fields.weight", scope: "decidim.admin") %></th>
+            <th><%= t("models.registration_type.fields.conference_meetings", scope: "decidim.admin") %></th>
+            <th><%= t("models.registration_type.fields.registrations_count", scope: "decidim.admin") %></th>
+            <th class="actions"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @registration_types.each do |registration_type| %>
+            <tr>
+              <td>
+                <%= translated_attribute(registration_type.title) %>
+              </td>
+              <td>
+                <%= registration_type.price %>
+              </td>
+              <td>
+                <%= registration_type.weight %>
+              </td>
+              <td>
+                <%= registration_type.conference_meeting_registration_types.count %>
+              </td>
+              <td>
+                <%= registration_type.conference_registrations.count %>
+              </td>
+              <td class="table-list__actions">
+                <% if allowed_to?(:update, :registration_type, registration_type: registration_type) && !registration_type.conference_registrations.any? %>
+                  <%= icon_link_to "pencil", edit_conference_registration_type_path(current_conference, registration_type), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
+
+                <% if allowed_to?(:update, :registration_type, registration_type: registration_type) %>
+                  <% if registration_type.published? %>
+                    <%= icon_link_to "x", conference_registration_type_publish_path(current_conference, registration_type), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :delete %>
+                  <% else %>
+                    <%= icon_link_to "check", conference_registration_type_publish_path(current_conference, registration_type), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
+                  <% end %>
+                <% end %>
+
+                <% if allowed_to?(:destroy, :registration_type, registration_type: registration_type) && !registration_type.conference_registrations.any? %>
+                  <%= icon_link_to "circle-x", conference_registration_type_path(current_conference, registration_type), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form new_registration_type" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("registration_types.new.title", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("registration_types.new.create", scope: "decidim.admin") %>
+  </div>
+<% end %>

data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma.html.erb

@@ -0,0 +1 @@
+<p><%= t(".diploma_html", title: translated_attribute(@conference.title), url: @locator.url) %></p>

data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb

@@ -0,0 +1,24 @@
+<main class="conference-diploma">
+  <div class="diploma__border">
+    <div class="diploma__content">
+      <div class="small-11 small-centered">
+        <div class="diploma__logo small-4 small-centered">
+          <%= wicked_pdf_image_tag @conference.main_logo.thumb.url %>
+        </div>
+        <div class="diploma__name small-10 small-centered">
+          <h2><strong><%= translated_attribute(@conference.title) %></strong></h2>
+          <h3><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance") %></h3>
+          <p><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance_description", user: @user.name, title: translated_attribute(@conference.title), location: @conference.location, start: l(@conference.start_date, format: :decidim_short), end: l(@conference.end_date, format: :decidim_short)  ).html_safe %></p>
+        </div>
+        <hr class="reset mt-m mb-m" />
+        <div class="diploma__attendance">
+          <strong><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.attendance_verified_by") %></strong>
+          <div>
+            <%= wicked_pdf_image_tag @conference.signature.thumb.url %>
+          </div>
+          <%= l(@conference.sign_date, format: :decidim_short) %>, <%= @conference.signature_name %>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

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

@@ -9,7 +9,6 @@
 <div class="row">
   <div class="column medium-10 medium-push-2">
     <% attribute = present(meeting).description %>
-    <div class="programme-resume"><%= decidim_sanitize(html_truncate((attribute), length: 50)) %></div>
     <div class="programme-extra">
       <% conference_meeting = meeting.becomes(Decidim::ConferenceMeeting) %>
       <% speakers = conference_meeting.conference_speakers %>
@@ -44,7 +43,7 @@
             <strong><%= t(".content") %></strong>
           </div>
           <div class="column medium-10">
-            <%= decidim_sanitize(present(meeting).html_description) %>
+            <%= decidim_sanitize(present(meeting).description(links: true)) %>
           </div>
         </div>
       <% end %>

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

@@ -1,3 +1,11 @@
 <p><%= t(".confirmed_html", title: translated_attribute(@conference.title), url: @locator.url) %></p>
 
-<p><%= t(".details") %></p>
+<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| %>
+    <li><%= present(conference_meeting).title %> </li>
+  <% end %>
+</ul>
+
+<p><%= t(".details_2") %></p>

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

@@ -0,0 +1,11 @@
+<p><%= t(".pending_html", title: translated_attribute(@conference.title), url: @locator.url) %></p>
+
+<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| %>
+    <li><%= present(conference_meeting).title %> </li>
+  <% end %>
+</ul>
+
+<p><%= t(".confirmation_pending") %></p>

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

@@ -8,7 +8,7 @@ edit_link(
 )
 %>
 
-<main class="wrapper">
+<%= participatory_space_wrapper do %>
   <% if promoted_conferences.any? %>
     <section id="highlighted-conferences" class="row section">
       <h1 class="section-heading"><%= t("conferences.index.promoted_conferences", scope: "layouts.decidim") %></h1>
@@ -22,4 +22,4 @@ edit_link(
       <%= render(collection) %>
     </div>
   </section>
-</main>
+<% end %>

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

@@ -14,8 +14,10 @@ edit_link(
 )
 %>
 
+<%= participatory_space_floating_help %>
+
 <div class="row">
-  <div class="columns mediumlarge-8 large-9">
+  <div class="columns mediumlarge-12">
     <section class="section">
       <h4 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h4>
       <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
@@ -28,7 +30,9 @@ edit_link(
         <div class="column medium-9 medium-centered">
           <% if current_participatory_space.registrations_enabled? %>
             <div class="column medium-6">
-              <%= cell "decidim/conferences/join_conference_button", current_participatory_space, big_button: true, show_remaining_slots: false, allowed: allowed_to?(:join, :conference, conference: current_participatory_space) %>
+              <%= 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 %>
             </div>
           <% end %>
           <% current_participatory_space.components.where(manifest_name: "meetings").each do |component_meeting| %>
@@ -57,24 +61,13 @@ edit_link(
             <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;">
-              <%= cell "decidim/conferences/join_conference_button", current_participatory_space, big_button: true, show_remaining_slots: false, allowed: allowed_to?(:join, :conference, conference: current_participatory_space) %>
+              <%= 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 %>
             </div>
           </div>
         <% else %>
-          <div class="row" data-equalizer>
-            <div class="column medium-6">
-              <div class="card p-m" data-equalizer-watch>
-                <p><%= t(".already_account") %></p>
-                <%= link_to t(".sign_in"), decidim.new_user_session_path, class: "" %>
-              </div>
-            </div>
-            <div class="column medium-6">
-              <div class="card p-m" data-equalizer-watch>
-                <p><%= t(".new_user") %></p>
-                <%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "" %>
-              </div>
-            </div>
-          </div>
+          <%= render partial: "decidim/conferences/shared/conference_user_login" %>
         <% end %>
       </section>
     <% end %>
@@ -94,12 +87,5 @@ edit_link(
       <%= render partial: "statistics" %>
     <% end %>
   </div>
-
-  <div class="columns section view-side mediumlarge-4 large-3">
-    <%= render partial: "conferences_sidebar" %>
-  </div>
 </div>
-
-<%= javascript_include_tag "decidim/proposals/social_share" %>
-<%= stylesheet_link_tag "decidim/proposals/social_share" %>
 <%= javascript_include_tag "decidim/conferences/conferences" %>

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

@@ -0,0 +1,30 @@
+<% add_decidim_meta_tags(title: t("registration_types.index.title", scope: "decidim.conferences")) %>
+
+<%
+edit_link(
+  decidim_admin_conferences.conference_registration_types_path(current_participatory_space.slug),
+  :update,
+  :conference,
+  conference: current_participatory_space
+)
+%>
+<div class="row">
+  <div class="columns mediumlarge-12">
+    <section class="section">
+      <h4 class="section-heading"><%= t("registration_types.index.register", scope: "decidim.conferences") %></h4>
+      <% if current_user.present? %>
+        <p><%= t(".login_as", name: current_user.name, email: current_user.email ) %></p>
+      <% else %>
+        <%= render partial: "decidim/conferences/shared/conference_user_login" %>
+      <% end %>
+      <% if collection.any? %>
+        <p><%= t(".choose_an_option") %></p>
+        <% collection.each do |registration_type| %>
+          <%= cell "decidim/conferences/registration_type", registration_type, allowed: allowed_to?(:join, :conference, conference: current_participatory_space) %>
+        <% end %>
+      <% else %>
+        No registrations
+      <% end %>
+    </section>
+  </div>
+</div>