mumuki-laboratory 9.0.1 → 9.0.6

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_terms.scss

@@ -31,6 +31,9 @@
 }
 .terms-card-body {
   padding: 1.25rem;
+  p {
+    text-align: justify;
+  }
 }
 
 .terms-acceptance {
@@ -41,5 +44,3 @@
     display: block
   }
 }
-
-

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_menu.scss

@@ -1,12 +1,41 @@
 .mu-user-menu {
   display: flex;
+  margin-top: 25px;
+}
+
+.mu-user-menu-content {
+  flex-grow: 1;
 }
 
 .mu-user-menu-header {
   font-size: 15px;
   color: $mu-color-disabled;
   text-transform: uppercase;
-  margin-bottom: 30px;
+  padding-left: 2px;
+  cursor: pointer;
+
+  @media only screen and (min-width: $screen-md-min) {
+    padding-left: 15px;
+    cursor: auto;
+
+    i {
+      display: none;
+    }
+
+    span {
+      padding-left: 0px;
+    }
+  }
+}
+
+.mu-user-menu-items {
+  margin-top: 30px;
+
+  &.mu-hidden-sm-screen {
+    @media only screen and (max-width: $screen-sm-max) {
+      display: none;
+    }
+  }
 }
 
 .mu-user-menu-item {
@@ -30,6 +59,5 @@
     border-top: 2px solid $mu-color-separator;
 
     margin: 25px 0;
-    width: 100%
   }
 }

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss

@@ -82,3 +82,4 @@
     }
   }
 }
+

data/app/controllers/certificates_controller.rb

@@ -0,0 +1,28 @@
+class CertificatesController < ApplicationController
+  include WithCertificateRender
+
+  before_action :authorize_if_private!, only: [:show]
+  before_action :set_certificate!
+  before_action :validate_current_user!, only: [:download]
+
+  def verify
+  end
+
+  def show
+  end
+
+  def download
+    send_data pdf_for(@certificate), filename: @certificate.filename
+  end
+
+  private
+
+  def set_certificate!
+    @certificate = Certificate.find_by! code: params[:code]
+  end
+
+  def validate_current_user!
+    raise Mumuki::Domain::NotFoundError unless @certificate.for_user? current_user
+  end
+
+end

data/app/controllers/concerns/with_certificate_render.rb

@@ -0,0 +1,25 @@
+require 'wicked_pdf'
+require 'rqrcode'
+
+module WithCertificateRender
+
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :qr_for
+  end
+
+  def qr_for(certificate)
+    qr = RQRCode::QRCode.new(verify_certificate_url certificate.code).as_svg(color: '0B465D')
+    "data:image/svg+xml,#{URI.encode(qr)}"
+  end
+
+  def pdf_for(certificate)
+    pdf_html = render_to_string(partial: 'certificates/download', locals: { certificate: certificate })
+    WickedPdf.new.pdf_from_string pdf_html,
+                                  orientation: 'Landscape',
+                                  page_size: 'A5',
+                                  margin: { top: 0.5, left: 1, bottom: 0.5, right: 1 }
+
+  end
+end

data/app/controllers/discussions_messages_controller.rb

@@ -3,7 +3,7 @@ class DiscussionsMessagesController < AjaxController
 
   before_action :set_discussion!, only: [:create, :destroy]
   before_action :authorize_user!, only: [:destroy]
-  before_action :authorize_moderator!, only: [:question, :approve]
+  before_action :authorize_moderator!, only: [:question, :approve, :preview]
 
   def create
     @discussion.submit_message! message_params, current_user
@@ -15,8 +15,12 @@ class DiscussionsMessagesController < AjaxController
     redirect_back(fallback_location: root_path)
   end
 
+  def preview
+    render json: { preview: Message.new(content: params[:content]).content_html }
+  end
+
   def approve
-    current_message.toggle_approved!
+    current_message.toggle_approved! current_user
     head :ok
   end
 

data/app/controllers/faqs_controller.rb

@@ -0,0 +1,6 @@
+class FAQsController < ApplicationController
+  def index
+    @faqs = Organization.current.faqs_html
+    raise Mumuki::Domain::NotFoundError unless @faqs.present?
+  end
+end

data/app/controllers/users_controller.rb

@@ -30,6 +30,14 @@ class UsersController < ApplicationController
     @watched_discussions = current_user.watched_discussions_in_organization
   end
 
+  def activity
+    @activity = UserStats.stats_for(current_user).activity date_range_params
+  end
+
+  def certificates
+    @certificates ||= current_user.certificates_in_organization
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!
@@ -50,4 +58,13 @@ class UsersController < ApplicationController
     @user = current_user
   end
 
+  def date_range_params
+    @date_from = params[:date_from].try { |it| Date.parse it }
+    to = params[:date_to].try { |it| Date.parse it }
+    if @date_from && to
+      @date_from.beginning_of_day..(to - 1.day).end_of_day
+    else
+      nil
+    end
+  end
 end

data/app/helpers/certificate_helper.rb

@@ -0,0 +1,13 @@
+module CertificateHelper
+  def linkedin_post_url(certificate)
+    URI::HTTPS.build host: 'www.linkedin.com',
+                     path: '/profile/add',
+                     query: Rack::Utils.build_query(startTask: 'CERTIFICATION_NAME',
+                                                    name: certificate.title,
+                                                    organizationId: ENV['MUMUKI_LINKEDIN_ORGANIZATION_ID'],
+                                                    issueYear: certificate.created_at.year,
+                                                    issueMonth: certificate.created_at.month,
+                                                    certUrl: verify_certificate_url(certificate.code),
+                                                    certId: certificate.code)
+  end
+end

data/app/helpers/discussions_helper.rb

@@ -12,7 +12,7 @@ module DiscussionsHelper
   end
 
   def user_discussions_link
-    discussions_link user_discussions_icon(t(:my_doubts)), user_path(anchor: 'discussions') if current_user.watched_discussions.present?
+    discussions_link(user_discussions_icon(t(:my_doubts)), discussions_user_path) if current_user.watched_discussions.present?
   end
 
   def others_discussions_icon(text)
@@ -195,4 +195,8 @@ module DiscussionsHelper
   def should_show_approved_for?(user, message)
     !user&.moderator_here? && message.approved? && !message.from_moderator?
   end
+
+  def discussion_user_name(user)
+    user.name
+  end
 end

data/app/helpers/links_helper.rb

@@ -59,10 +59,18 @@ module LinksHelper
     link_to t(:forum_terms), discussions_terms_path, target: '_blank'
   end
 
+  def link_to_faqs
+    link_to t(:faqs), faqs_path, target: '_blank' if faqs_enabled_here?
+  end
+
   def turbolinks_enable_for(exercise)
     %Q{data-turbolinks="#{!exercise.input_kids?}"}.html_safe
   end
 
+  def faqs_enabled_here?
+    Organization.current.faqs.present?
+  end
+
   private
 
   def extract_name(named, options)

data/app/helpers/menu_bar_helper.rb

@@ -1,9 +1,9 @@
 module MenuBarHelper
   def menu_bar_links
     [
-      link_to_profile,
-      link_to_classroom,
-      link_to_bibliotheca,
+      menu_link_to_profile,
+      menu_link_to_classroom,
+      menu_link_to_bibliotheca,
       solve_discussions_link,
       user_discussions_link
     ]
@@ -17,25 +17,25 @@ module MenuBarHelper
     content_tag :li, link
   end
 
-  def link_to_profile
+  def menu_link_to_profile
     menu_item('user', :my_account, user_path)
   end
 
-  def link_to_classroom
-    link_to_application 'graduation-cap', :classroom_ui, :teacher_here?
+  def menu_link_to_classroom
+    menu_link_to_application 'graduation-cap', :classroom_ui, :teacher_here?
   end
 
-  def link_to_bibliotheca
-    link_to_application :book, :bibliotheca_ui, :writer?
+  def menu_link_to_bibliotheca
+    menu_link_to_application :book, :bibliotheca_ui, :writer?
   end
 
-  def link_to_application(icon, app_name, minimal_permissions)
+  def menu_link_to_application(icon, app_name, minimal_permissions)
     return unless current_user&.send(minimal_permissions)
     url = url_for_application(app_name)
     menu_item icon, app_name, url
   end
 
-  def logout_link
+  def logout_menu_link
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
   end
 
@@ -46,4 +46,8 @@ module MenuBarHelper
   def any_menu_bar_links?
     menu_bar_links.any?
   end
+
+  def menu_link_to_faqs
+    li_tag menu_item('question', :faqs, faqs_path)
+  end
 end

data/app/helpers/multiple_file_editor_helper.rb

@@ -9,6 +9,7 @@ module MultipleFileEditorHelper
 
   def multifile_hidden_inputs
     hidden_field_tag('highlight-modes', highlight_modes.to_json) +
-    hidden_field_tag('multifile-locales', multifile_locales.to_json)
+    hidden_field_tag('multifile-locales', multifile_locales.to_json) +
+    hidden_field_tag('multifile-default-content', @files.to_json)
   end
 end

data/app/helpers/user_activity_helper.rb

@@ -0,0 +1,48 @@
+module UserActivityHelper
+  def activity_selector_week_range_for(organization = Organization.current)
+    start = organization.activity_start_date min_week
+    (start.prev_occurring(:monday) + 1..Date.today)
+        .step(7)
+        .to_a
+        .reverse
+        .map { |it| [it, it + 7.days] }
+  end
+
+  def mark_period_if_active(period_start)
+    active_period?(period_start) && 'class=active'
+  end
+
+  def solved_exercises_percentage
+    percentage = @activity[:exercises][:solved_count].to_f / @activity[:exercises][:count] * 100
+    "#{percentage.ceil}%"
+  end
+
+  def exercises_activity_stats
+    solved_count = {
+        name: t(:solved_exercises_count, count: @activity[:exercises][:solved_count]),
+        value: @activity[:exercises][:solved_count] }
+    solved_percentage = {
+        name: t(:solved_exercises_percentage),
+        value: solved_exercises_percentage }
+
+    @date_from ? [solved_count] : [solved_count, solved_percentage]
+  end
+
+  def messages_activity_stats
+    count = @activity[:messages][:count]
+    approved = @activity[:messages][:approved]
+
+    [{name: t(:messages_pluralized, count: count), value: count},
+     {name: t(:approved_messages, count: approved), value: approved}]
+  end
+
+  private
+
+  def active_period?(period_start)
+    period_start ? @date_from == period_start : !@date_from
+  end
+
+  def min_week
+    8.week.ago.to_date
+  end
+end

data/app/helpers/user_menu_helper.rb

@@ -1,18 +1,40 @@
 module UserMenuHelper
+  def user_menu_header
+    content_tag :div, user_menu_header_icon, class: 'mu-user-menu-header'
+  end
+
+  def user_menu_divider
+    content_tag :div, '', class: 'mu-user-menu-divider horizontal'
+  end
+
   def profile_user_menu_link
-    user_menu_link t(:my_profile), user_path, 'show'
+    user_menu_item t(:my_profile), user_path, 'show'
   end
 
   def messages_user_menu_link
-    user_menu_link t(:messages), messages_user_path, 'messages'
+    user_menu_item t(:messages), messages_user_path, 'messages'
   end
 
   def discussions_user_menu_link
-    user_menu_link t(:discussions), discussions_user_path, 'discussions'
+    user_menu_item t(:discussions), discussions_user_path, 'discussions' if current_user&.can_discuss_here?
+  end
+
+  def activity_user_menu_link
+    user_menu_item t(:activity), activity_user_path, 'activity'
   end
 
-  def user_menu_link(label, path, active_on)
+  def certificates_user_menu_link
+    user_menu_item t(:certificates), certificates_user_path, 'certificates'
+  end
+
+  private
+
+  def user_menu_item(label, path, active_on)
     link_klass = 'active' if action_name == active_on
-    link_to label, path, { class: link_klass }.compact
+    content_tag :div, link_to(label, path, { class: link_klass }.compact), class: 'mu-user-menu-item'
+  end
+
+  def user_menu_header_icon
+    fa_icon('chevron-down', text: t(:my_account), id: 'mu-user-menu-header-icon', right: true)
   end
 end

data/app/mailers/application_mailer.rb

@@ -13,4 +13,3 @@ class ApplicationMailer < ActionMailer::Base
     mailer_environment_variables.all? { |env_var| ENV[env_var].present? }
   end
 end
-

data/app/mailers/user_mailer.rb

@@ -1,4 +1,6 @@
 class UserMailer < ApplicationMailer
+  include WithCertificateRender
+
   def welcome_email(user, organization)
     with_locale(user, organization) do
       organization_name = organization.display_name || t(:your_new_organization)
@@ -18,6 +20,13 @@ class UserMailer < ApplicationMailer
     end
   end
 
+  def certificate(certificate)
+    with_locale certificate.user, certificate.organization do
+      attachments[certificate.filename] = pdf_for(certificate)
+      mail to: certificate.user.email, subject: t(:certificate)
+    end
+  end
+
   def with_locale(user, organization = nil, &block)
     @user = user
     @unsubscribe_code = User.unsubscription_verifier.generate(user.id)

data/app/views/certificates/_certificate.html.erb

@@ -0,0 +1,44 @@
+<style>
+
+  .mu-certificate-box {
+    overflow: hidden;
+    height: 210mm;
+    width: 297mm;
+    max-height: 210mm;
+    max-width: 297mm;
+    min-height: 210mm;
+    min-width: 297mm;
+    margin: 0;
+    box-sizing: border-box;
+    position: relative;
+    border: 1px solid lightgrey;
+  }
+
+  .mu-certificate-box section {
+    background: transparent;
+    z-index: 10;
+  }
+
+  .background-image {
+    position: absolute;
+    height: 210mm;
+    width: 297mm;
+    margin: 0;
+    padding: 0;
+    z-index: 0;
+  }
+
+  .qr-code {
+    position: absolute;
+    z-index: 10;
+  }
+
+</style>
+
+<div class="mu-certificate-box">
+  <img src="<%= certificate.background_image_url %>" class="background-image"/>
+  <%= render inline: certificate.template_html_erb, locals: certificate.template_locals %>
+  <a href="<%= verify_certificate_path certificate.code %>" target="_blank">
+    <div><img class="qr-code" src="<%= qr_for certificate %>"/></div>
+  </a>
+</div>