mumuki-laboratory 9.8.2 → 9.12.0

data/app/views/user_mailer/no_submissions_reminder.text.erb

@@ -4,10 +4,6 @@
 <%= t :you_never_submitted_solutions %>
 
 <%= t :dont_leave_us %>
-<%= t :keep_learning %>
 
 
-© Copyright 2015-<%= DateTime.now.year %> Mumuki.
-
-<%= t :stop_emails? %>
-<%= t :cancel_subscription %>
+© Copyright 2015-<%= Time.current.year %> Mumuki.

data/app/views/user_mailer/notification.html.erb

@@ -0,0 +1 @@
+<%= render partial: "user_mailer/notifications/#{@notification.subject}" %>

data/app/views/user_mailer/notification.text.erb

@@ -0,0 +1,6 @@
+<%= t :you_have_a_new_notification %>
+
+<%= render(partial: "notifications/#{@notification.subject}", locals: { notification: @notification }) %>
+
+
+© Copyright 2015-<%= Time.current.year %> Mumuki.

data/app/views/user_mailer/notifications/_custom.html.erb

@@ -0,0 +1,11 @@
+<% if @notification.custom_content_html.present? %>
+  <%= render inline: @notification.custom_content_html %>
+<% else %>
+  <%= render partial: 'user_mailer/mail_template', locals: {
+    title: t("mailer.title.custom"),
+    subtitle: '',
+    text: @notification.custom_content_plain_text,
+    button: t("mailer.button.custom"),
+    url: @organization.url_for('/user/notifications')
+  } %>
+<% end %>

data/app/views/user_mailer/notifications/_exam_authorization_request_updated.html.erb

@@ -0,0 +1 @@
+<%= render partial: "user_mailer/notifications/exam_authorization_request_updated/#{@notification.target.status}" %>

data/app/views/user_mailer/notifications/_exam_registration.html.erb

@@ -0,0 +1,7 @@
+<%= render partial: 'user_mailer/mail_template', locals: {
+  title: t("mailer.title.exam_registration"),
+  subtitle: t("mailer.subtitle.exam_registration"),
+  text: t("mailer.text.exam_registration", exam_registration_deadline: local_time(@notification.target.end_time, @organization.time_zone)),
+  button: t("mailer.button.exam_registration"),
+  url: exam_registration_url(@organization, @notification.target)
+} %>

data/app/views/user_mailer/notifications/exam_authorization_request_updated/_approved.html.erb

@@ -0,0 +1,7 @@
+<%= render partial: 'user_mailer/mail_template', locals: {
+  title: t(:congratulations),
+  subtitle: t('mailer.subtitle.exam_authorization_request_approved'),
+  text: t('mailer.text.exam_authorization_request_approved', exam_start_date: local_time(@notification.target.exam.start_time, @organization.time_zone)),
+  button: t('mailer.button.exam_authorization_request_approved'),
+  url: @organization.url
+} %>

data/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb

@@ -0,0 +1,7 @@
+<%= render partial: 'user_mailer/mail_template', locals: {
+  title: t("mailer.title.exam_authorization_request_rejected"),
+  subtitle: t("mailer.subtitle.exam_authorization_request_rejected"),
+  text: t("mailer.text.exam_authorization_request_rejected"),
+  button: t("mailer.button.exam_authorization_request_rejected"),
+  url: @organization.url_for('/user/exam_authorizations')
+} %>

data/app/views/users/_basic_profile_fields.html.erb

@@ -0,0 +1,30 @@
+<fieldset>
+  <div><%= form.label(t :first_name) %></div>
+  <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset>
+  <div><%= form.label(t :last_name) %></div>
+  <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset>
+  <div><%= form.label(t :gender) %></div>
+  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
+</fieldset>
+<fieldset>
+  <div><%= form.label(t :birthdate) %></div>
+  <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset>
+  <div><%= form.label(t :email) %></div>
+  <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>
+</fieldset>
+
+<% if show_verified_full_name_notice?(@user, Organization.current) %>
+  <label><%= (t :verified_full_name) %></label>
+  <input class="form-control" readonly="readonly" value="<%= @user.verified_full_name %>">
+  <p class="fs-7">
+    <%= fa_icon("question-circle", text: (t :verified_full_name_notice,
+                                            organization: Organization.current.display_name,
+                                            contact: Organization.current.contact_email)) %>
+  </p>
+<% end %>

data/app/views/users/_profile_fields.html.erb

@@ -1,20 +1 @@
-<fieldset>
-  <div><%= form.label(t :first_name) %></div>
-  <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :last_name) %></div>
-  <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :gender) %></div>
-  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :birthdate) %></div>
-  <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :email) %></div>
-  <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>
-</fieldset>
+<%= render partial: 'users/basic_profile_fields', locals: {form: form} %>

data/app/views/users/discussions.html.erb

@@ -14,17 +14,25 @@
         <%= t :discussions_will_be_here %>
       </div>
     <% else %>
-      <table class="table table-striped">
-        <% @watched_discussions.each do |discussion| %>
-          <tr>
-            <td>
-              <%= icon_for_read(discussion.read_by?(@user)) %>
-            </td>
-            <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
-            <td><%= time_ago_in_words discussion.last_message_date %></td>
-          </tr>
-        <% end %>
-      </table>
+      <div class="table-responsive mb-3">
+        <table class="table">
+          <% @watched_discussions.each do |discussion| %>
+            <% if discussion.read_by?(@user) != @last_read %>
+              <%= user_discussions_table_title(discussion, @user, @last_read) %>
+              <% @last_read = discussion.read_by?(@user) %>
+
+              <%= user_discussions_table_header %>
+            <% end %>
+
+            <%= user_discussions_table_item(discussion, @user) %>
+          <% end %>
+        </table>
+      </div>
+
+      <div class="discussion-pagination">
+        <%= paginate @watched_discussions, nav_class: 'pagination' %>
+      </div>
+
     <% end %>
   </div>
 </div>

data/app/views/users/manage_notifications.html.erb

@@ -0,0 +1,26 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<div class="row">
+  <%= form_for :notifications, html: {class: 'mu-form'} do |f| %>
+    <div class="mu-tab-body">
+      <div class="mu-user-header">
+        <h1><%= t(:manage_notifications) %></h1>
+        <div class="mu-profile-actions d-none d-md-block">
+          <a class="btn btn-secondary" href="<%= notifications_user_path %>">Cancelar</a>
+          <button type="submit" class="btn btn-complementary"><%= t :save %></button>
+        </div>
+      </div>
+
+      <p><%= t(:i_want_emails_of) %>:</p>
+      <% Notification.subjects.keys.each do |subject| %>
+        <div class="form-check">
+          <%= label_tag subject, t("notification_subject.#{subject}"), class: 'form-check-label' %>
+          <%= f.check_box subject, checked: !@user.ignored_notifications.include?(subject), class: 'form-check-input' %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+

data/app/views/users/messages.html.erb

@@ -16,7 +16,7 @@
     <% else %>
       <table class="table table-striped">
         <% @messages.each do |message| %>
-          <tr>
+          <tr class="<%= staleness_class(message) %>" >
             <td><%= icon_for_read(message.read?) %></td>
             <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
             <td><%= mail_to message.sender %></td>

data/app/views/users/notifications.html.erb

@@ -0,0 +1,54 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
+
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header d-flex justify-content-between">
+      <span>
+        <h1><%= t(:notifications) %></h1>
+      </span>
+      <span>
+        <a href="notifications/manage" class="btn btn-complementary"><%= t(:manage_notifications) %></a>
+      </span>
+    </div>
+    <% if @notifications.empty? %>
+      <div class="mu-tab-body">
+        <%= t :notifications_will_be_here %>
+      </div>
+    <% else %>
+
+
+      <div class="table-responsive mb-3">
+        <table class="table">
+          <tr class="fw-bold">
+            <td></td>
+            <td><%= t(:content) %></td>
+            <td><%= t(:created_at) %></td>
+          </tr>
+
+          <% @notifications.each do |notification| %>
+            <tr class="<%= background_for_notification notification %>" >
+              <td class="col-md-1">
+                <%= link_to icon_for_read(notification.read?), "notifications/#{notification.id}/toggle_read", tooltip_options(:toggle_read).merge(method: :post, role: :button) %>
+              </td>
+              <td class="col-md-8 text-break">
+                <%= render partial: "notifications/#{notification.subject}", locals: { notification: notification } %>
+              </td>
+              <td class="col-md-3">
+                <%= t(:time_since, time: time_ago_in_words(notification.created_at)) %>
+              </td>
+            </tr>
+          <% end %>
+        </table>
+      </div>
+
+      <div class="notification-pagination">
+        <%= paginate @notifications, nav_class: 'pagination' %>
+      </div>
+    <% end %>
+  </div>
+</div>
+

data/config/routes.rb

@@ -72,12 +72,15 @@ Rails.application.routes.draw do
       get :certificates
       get :exam_authorizations
 
+      get :notifications
+      post 'notifications/:id/toggle_read', action: :toggle_read
+      get 'notifications/manage', action: :show_manage_notifications
+      post 'notifications/manage', action: :manage_notifications
     end
 
     resources :faqs, only: [:index]
 
     resources :messages, only: [:index, :create]
-    get '/messages/errors' => 'messages#errors'
 
     get 'certificates/verify/:code', to: 'certificates#verify', as: :verify_certificate
     get 'certificates/download/:code', to: 'certificates#download', as: :download_certificate

data/lib/mumuki/laboratory.rb

@@ -59,3 +59,4 @@ require_relative './laboratory/version'
 require_relative './laboratory/extensions'
 require_relative './laboratory/controllers'
 require_relative './laboratory/engine'
+require_relative './laboratory/mailers/message_delivery'

data/lib/mumuki/laboratory/controllers/notifications.rb

@@ -4,10 +4,10 @@ module Mumuki::Laboratory::Controllers::Notifications
   end
 
   def notifications_count
-    notifications.size
+    user_notifications.size
   end
 
-  def notifications
+  def user_notifications
     current_user.try(:unread_notifications) || []
   end
 end

data/lib/mumuki/laboratory/locales/en.yml

@@ -21,6 +21,7 @@ en:
   ask_community: Ask community for help
   ask_redirect: Do you want to go there?
   ask_the_first_question: Be the first one to ask!
+  asked_time_since: asked %{time} ago
   attempts_left:
     zero: "You've run out of attempts"
     one: "1 attempt remaining"
@@ -36,6 +37,8 @@ en:
   cancel: Cancel
   cancel_subscription: Cancel your subscription.
   certificate: Certificate
+  certificate_available: Your certificate is available!
+  certificate_download: You can find it attached to this email or in your Mumuki profile
   certificates: Certificates
   certificates_will_be_here: Your certificates in the organization will appear here.
   certificate_verified_legend: "<strong>%{full_name}</strong>'s account is verified. Mumuki certifies their successful completion of <strong>%{description}</strong>."
@@ -55,6 +58,7 @@ en:
   confirm: Confirm
   confirm_reset: You are about to restart your exercise. Do you want to proceed?
   confirm_restart: You are about to delete your progress for this guide. Do you want to proceed?
+  congratulations: Congratulations!
   console: Console
   contact_administrator: 'If you think this is not supposed to happen, please contact %{link}'
   content: Content
@@ -83,10 +87,13 @@ en:
   destroy_message: delete the message
   disabled_explanation: You are trying to visit a permamently disabled or deleted resource
   disabled_organization_explanation: This path has already finished.
+  discussion_created_by: Created by
   discussion_description_placeholder: You can add more information regarding your doubt.
-  new_discussion_message: New message on %{title}
+  new_discussion_message: New reply on %{title}
   discussion_updated: Discussion updated
   discussions: Discussions
+  discussions_read: Read
+  discussions_unread: Unread
   discussions_will_be_here: Your posts in the forum will appear here.
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
   download: Download your solution
@@ -133,7 +140,8 @@ en:
   expected_state: Expected board
   explain_redirect: You have registered in another organization
   failed: Oops, something went wrong
-  faqs: FAQs
+  faqs: Frequently Asked Questions
+  faqs_abbreviated: FAQs
   feedback: Feedback
   female: Female
   file_exceeds_max_size: "File size should not exceed %{size_kb}kb. Please select another file."
@@ -157,6 +165,7 @@ en:
   hidden_done: 'Good!'
   history: History
   home: Home
+  i_want_emails_of: I want to receive emails of
   important_info: Important information
   initial_state: Initial board
   insert_file_name: Insert a file name
@@ -168,6 +177,7 @@ en:
   keep_learning: Keep learning!
   kids_default_success: You did it great!
   language: Language
+  last_message: Last message
   last_name: Last Name
   last_submission_date: Last submission
   latest_exercises: Latest exercises
@@ -183,13 +193,33 @@ en:
   loading: Loading
   load_solution_into_console: Load your solution into the console
   locked_content: 'This content will be unlocked when you finish previous chapters'
+  mailer:
+    title:
+      exam_authorization_request_updated: There are updates in your exam registration
+      exam_authorization_request_rejected: Exam registration rejected
+      exam_registration: Exam registrations open
+      custom: You have a new notification!
+    subtitle:
+      exam_authorization_request_approved: Your registration request to the exam has been approved.
+      exam_authorization_request_rejected: Your registration request to the exam has been rejected because the requirements weren't met.
+      exam_registration: ¡You can register for the exam!
+    text:
+      exam_authorization_request_approved: You can sit for the exam on %{exam_start_date} by going into the platform. ¡Good luck!
+      exam_authorization_request_rejected: ¡Don't be upset! You did a great job and we hope you'll keep learning programming.
+      exam_registration: You have until %{exam_registration_deadline} to sign up. In order to be approved, you must meet the requirements.
+    button:
+      exam_registration: Sign up for the exam
+      exam_authorization_request_approved: Go to the platform
+      exam_authorization_request_rejected: My exams
+      custom: My notifications
   male: Male
+  manage_notification_subscriptions: Manage your notification subscriptions
+  manage_notifications: Manage notifications
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
   medal: Medal
   message: Message
   message_deleted: This message was deleted because it %{motive}, which violates the %{forum_terms}.
   messages: Messages
-  messages_error: Previous messages are unavailable. Please try again later.
   messages_pluralized:
     one: Message
     other: Messages
@@ -204,9 +234,9 @@ en:
     you_are: You're taking care of it
     you_will_confirmation: You'll take care of this discussion. If you change your mind, click the button again.
     you_wont_confirmation: You won't take care of this discussion.
-  more_messages: More
   my_account: My account
   my_doubts: My doubts
+  my_notifications: My notifications
   my_profile: My profile
   my_submissions: My Submissions
   name: Name
@@ -234,7 +264,12 @@ en:
   no_useful_result: Didn't find what you were looking for?
   not_found_explanation: 'You may have mistyped the address or the page may have moved.'
   not_in_any_organizations: It seems you aren't in any organizations yet!
+  notification_subject:
+    custom: General announcements
+    exam_authorization_request_updated: Exam registrations updated
+    exam_registration: Exam registrations enabled
   notifications: Notifications
+  notifications_will_be_here: Notifications will be here
   notify_problem_with_exercise: Report a bug
   office: Office
   only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
@@ -254,6 +289,7 @@ en:
   permissions: Permissions
   please_fill_profile_data: Please complete your profile data to continue!
   please_validate: 'Please validate your data before continue:'
+  preferences_updated_successfully: Preferences updated successfully
   preview: Preview
   preview_error: The preview cannot be shown. Check your internet connection or try with a shorter message.
   previous_exercise: Previous
@@ -261,8 +297,8 @@ en:
   processing_your_solution: We are processing you solution
   profile_of: Profile of %{username}
   programming_since: Started programming
-  progress: Progresss
-  read: Read
+  progress: Progress
+  publish_discussion: Publish discussion
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
   reply_count:
     one: 1 reply
@@ -323,13 +359,14 @@ en:
   terms_and_conditions_continue_disclaimer: By continuing you agree to %{terms_link}
   terms_and_conditions_must_be_accepted: You must accept the terms and conditions
   test_results: Test results
-  time_ago: "%{time} ago"
+  time_since: "%{time} ago"
   time_left: You have
   title: Title
   to_closed: Close
   to_opened: Reopen
   to_pending_review: Mark as solved
   to_solved: Mark as solved
+  toggle_read: "Toggle read/unread"
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
   total: Total
   undo_upvote: Undo upvote
@@ -346,6 +383,8 @@ en:
   user: User
   user_data_updated: Your data was updated successfully
   username: Username
+  verified_full_name: Verified name
+  verified_full_name_notice: Your verified name was provided by %{organization}. If there's a mistake, please send an email to %{contact}.
   view_details: View details
   want_permissions: The following user requires permissions for the organization
   we_miss_you: We miss you!
@@ -355,6 +394,7 @@ en:
   wrong_answer: The answer is wrong
   years: years old
   you_earned: You earned
+  you_have_a_new_notification: You have a new notification!
   you_must_sign_in_before_submitting: You must sign in before submitting your solutions
   you_never_submitted_solutions: It seems that you've never submitted solutions since you created your account.
   your_new_organization: your new organization