biovision-base 0.7.170709 → 0.8.170916

data/app/controllers/stored_values_controller.rb

@@ -0,0 +1,56 @@
+class StoredValuesController < AdminController
+  before_action :set_entity, only: [:edit, :update, :destroy]
+
+  # get /stored_values/new
+  def new
+    @entity = StoredValue.new
+  end
+
+  # post /stored_values
+  def create
+    @entity = StoredValue.new(entity_parameters)
+    if @entity.save
+      redirect_to admin_stored_value_path(@entity.id)
+    else
+      render :new, status: :bad_request
+    end
+  end
+
+  # get /stored_values/:id/edit
+  def edit
+  end
+
+  # patch /stored_values/:id
+  def update
+    if @entity.update(entity_parameters)
+      redirect_to admin_stored_value_path(@entity.id), notice: t('stored_values.update.success')
+    else
+      render :edit, status: :bad_request
+    end
+  end
+
+  # delete /stored_values/:id
+  def destroy
+    if @entity.destroy
+      flash[:notice] = t('stored_values.destroy.success')
+    end
+    redirect_to admin_stored_values_path
+  end
+
+  protected
+
+  def restrict_access
+    require_privilege :administrator
+  end
+
+  def set_entity
+    @entity = StoredValue.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find stored_value')
+    end
+  end
+
+  def entity_parameters
+    params.require(:stored_value).permit(StoredValue.entity_parameters)
+  end
+end

data/app/controllers/users_controller.rb

@@ -10,6 +10,7 @@ class UsersController < AdminController
   def create
     @entity = User.new(creation_parameters)
     if @entity.save
+      @entity.user_profile.update(profile_parameters)
       redirect_to admin_user_path(@entity.id), notice: t('users.create.success')
     else
       render :new, status: :bad_request
@@ -23,6 +24,7 @@ class UsersController < AdminController
   # patch /users/:id
   def update
     if @entity.update(entity_parameters)
+      @entity.user_profile.update(profile_parameters)
       redirect_to admin_user_path(@entity.id), notice: t('users.update.success')
     else
       render :edit, status: :bad_request
@@ -54,4 +56,8 @@ class UsersController < AdminController
   def creation_parameters
     params.require(:user).permit(User.entity_parameters).merge(tracking_for_entity)
   end
+
+  def profile_parameters
+    params.require(:user_profile).permit(UserProfile.entity_parameters)
+  end
 end

data/app/helpers/biovision_users_helper.rb

@@ -1,8 +1,8 @@
 module BiovisionUsersHelper
   def genders_for_select
     genders = [[t(:not_selected), '']]
-    prefix  = 'activerecord.attributes.user.genders.'
-    genders + User.genders.keys.to_a.map { |o| [I18n.t("#{prefix}#{o}"), o] }
+    prefix  = 'activerecord.attributes.user_profile.genders.'
+    genders + UserProfile.genders.keys.to_a.map { |o| [I18n.t("#{prefix}#{o}"), o] }
   end
 
   # @param [User] entity
@@ -40,7 +40,7 @@ module BiovisionUsersHelper
     return image_tag('biovision/base/placeholders/user.svg') if entity.image.blank?
 
     versions = "#{entity.image.preview_2x.url} 2x"
-    image_tag(entity.image.preview.url, alt: entity.name, srcset: versions)
+    image_tag(entity.image.preview.url, alt: entity.profile_name, srcset: versions)
   end
 
   # @param [ForeignSite] foreign_site

data/app/helpers/stored_values_helper.rb

@@ -0,0 +1,6 @@
+module StoredValuesHelper
+  # @param [StoredValue] entity
+  def admin_stored_value_link(entity)
+    link_to entity.slug, admin_stored_value_path(entity.id)
+  end
+end

data/app/models/central_region.rb

@@ -46,4 +46,8 @@ class CentralRegion
   def child_regions
     []
   end
+
+  def subbranch_ids
+    []
+  end
 end

data/app/models/region.rb

@@ -64,6 +64,11 @@ class Region < ApplicationRecord
     parents_cache.split(',').map(&:to_i).reject { |i| i < 1 }.uniq + [id]
   end
 
+  # @return [Array<Integer>]
+  def subbranch_ids
+    [id] + children_cache
+  end
+
   def depth
     parent_ids.count
   end

data/app/models/stored_value.rb

@@ -0,0 +1,28 @@
+class StoredValue < ApplicationRecord
+  include RequiredUniqueSlug
+
+  SLUG_LIMIT = 50
+  NAME_LIMIT = 100
+  DESCRIPTION_LIMIT = 250
+  VALUE_LIMIT = 255
+
+  validates_length_of :slug, maximum: SLUG_LIMIT
+  validates_length_of :name, maximum: NAME_LIMIT
+  validates_length_of :description, maximum: DESCRIPTION_LIMIT
+  validates_length_of :value, maximum: VALUE_LIMIT
+
+  def self.page_for_administration
+    ordered_by_slug
+  end
+
+  def self.entity_parameters
+    %i(slug name description value)
+  end
+
+  # @param [String] slug
+  # @param [String] default
+  def self.receive(slug, default = '')
+    entity = find_by(slug: slug)
+    entity&.value || default
+  end
+end

data/app/models/user.rb

@@ -10,23 +10,19 @@ class User < ApplicationRecord
 
   SLUG_LIMIT   = 250
   EMAIL_LIMIT  = 250
-  NAME_LIMIT   = 100
   NOTICE_LIMIT = 255
   PHONE_LIMIT  = 50
 
   toggleable %i(allow_login bot email_confirmed phone_confirmed allow_mail)
 
-  belongs_to :agent, optional: true
-
   has_secure_password
 
   mount_uploader :image, AvatarUploader
 
-  enum gender: [:female, :male]
-
   belongs_to :agent, optional: true
   belongs_to :inviter, class_name: User.to_s, optional: true
   belongs_to :region, optional: true, counter_cache: true
+  has_one :user_profile, dependent: :destroy
   has_many :invitees, class_name: User.to_s, foreign_key: :inviter_id, dependent: :nullify
   has_many :tokens, dependent: :delete_all
   has_many :codes, dependent: :delete_all
@@ -36,6 +32,8 @@ class User < ApplicationRecord
   has_many :login_attempts, dependent: :delete_all
 
   before_save :normalize_slug
+  before_save :prepare_search_string
+  after_create { UserProfile.create(user: self) }
 
   validates_presence_of :screen_name, :email
   validates_format_of :screen_name, with: /\A[a-z0-9_]{1,30}\z/i, if: :native_slug?
@@ -44,21 +42,17 @@ class User < ApplicationRecord
   validates :email, uniqueness: { case_sensitive: false }
   validates_length_of :slug, maximum: SLUG_LIMIT
   validates_length_of :screen_name, maximum: SLUG_LIMIT
-  validates_length_of :name, maximum: NAME_LIMIT
-  validates_length_of :patronymic, maximum: NAME_LIMIT
-  validates_length_of :surname, maximum: NAME_LIMIT
   validates_length_of :email, maximum: EMAIL_LIMIT
   validates_length_of :phone, maximum: PHONE_LIMIT
   validates_length_of :notice, maximum: NOTICE_LIMIT
 
   scope :with_privilege, ->(privilege) { joins(:user_privileges).where(user_privileges: { privilege_id: privilege.branch_ids }) }
   scope :bots, ->(flag) { where(bot: flag.to_i > 0) unless flag.blank? }
-  scope :name_like, ->(val) { where('name ilike ?', "%#{val}%") unless val.blank? }
   scope :email_like, ->(val) { where('email ilike ?', "%#{val}%") unless val.blank? }
   scope :with_email, ->(email) { where('lower(email) = lower(?)', email) }
   scope :screen_name_like, ->(val) { where('screen_name ilike ?', "%#{val}%") unless val.blank? }
-  scope :search, ->(q) { where("lower(concat_ws(' ', slug, email, surname, name)) like ?", "%#{q.downcase}%") unless q.blank? }
-  scope :filtered, ->(f) { name_like(f[:name]).email_like(f[:email]).screen_name_like(f[:screen_name]) }
+  scope :search, ->(q) { where('search_string like ?', "%#{q.downcase}%") unless q.blank? }
+  scope :filtered, ->(f) { email_like(f[:email]).screen_name_like(f[:screen_name]) }
 
   # @param [Integer] page
   # @param [Hash] filter
@@ -67,7 +61,7 @@ class User < ApplicationRecord
   end
 
   def self.profile_parameters
-    %i(image name patronymic surname birthday gender allow_mail)
+    %i(image allow_mail)
   end
 
   def self.sensitive_parameters
@@ -92,12 +86,30 @@ class User < ApplicationRecord
     (min..max)
   end
 
+  def profile
+    user_profile
+  end
+
+  # Name to be shown as profile
+  #
+  # This can be redefined for cases when something other than screen name should
+  # be used.
+  #
+  # @return [String]
   def profile_name
     screen_name
   end
 
   def name_for_letter
-    name.blank? ? profile_name : name
+    user_profile&.name.blank? ? profile_name : user_profile.name
+  end
+
+  # @param [Boolean] include_patronymic
+  def full_name(include_patronymic = false)
+    result = [name_for_letter]
+    result << user_profile&.patronymic.to_s.strip if include_patronymic
+    result << user_profile&.surname.to_s.strip
+    result.compact.join(' ')
   end
 
   def can_receive_letters?
@@ -117,4 +129,12 @@ class User < ApplicationRecord
       self.slug = slug.downcase
     end
   end
+
+  def prepare_search_string
+    new_string = "#{slug} #{email}"
+    unless user_profile.nil?
+      new_string << " #{user_profile.search_string}"
+    end
+    self.search_string = new_string.downcase
+  end
 end

data/app/models/user_profile.rb

@@ -0,0 +1,21 @@
+class UserProfile < ApplicationRecord
+  NAME_LIMIT   = 100
+
+  enum gender: [:female, :male]
+
+  belongs_to :user
+
+  validates_length_of :name, maximum: NAME_LIMIT
+  validates_length_of :patronymic, maximum: NAME_LIMIT
+  validates_length_of :surname, maximum: NAME_LIMIT
+  validates_uniqueness_of :user_id
+
+  def self.entity_parameters
+    excluded = %w(id user_id created_at updated_at)
+    column_names.reject { |c| excluded.include? c }
+  end
+
+  def search_string
+    "#{name} #{surname}"
+  end
+end

data/app/services/user_manager.rb

@@ -0,0 +1,32 @@
+class UserManager
+  attr_accessor :user
+
+  # @param [User] user
+  def initialize(user = nil)
+    @user = user
+  end
+
+  # @param [Hash] user_parameters
+  # @param [Hash] profile_parameters
+  def self.create(user_parameters, profile_parameters)
+    user = User.new(user_parameters)
+    if user.save
+      profile = user.user_profile.new(profile_parameters)
+      profile.save
+    else
+      profile = nil
+    end
+    { user: user, profile: profile }
+  end
+
+  # @param [Hash] user_parameters
+  # @param [Hash] profile_parameters
+  def update(user_parameters, profile_parameters)
+    raise 'User is not set' if @user.nil?
+    @user.update(user_parameters)
+    profile = @user.user_profile || @user.user_profile.create
+    profile.update(profile_parameters)
+
+    { user: @user, profile: profile }
+  end
+end

data/app/views/about/editable.html.erb

@@ -0,0 +1,11 @@
+<% if @editable_page.nil? %>
+    <% content_for :meta_title, t('.title') %>
+
+    <article>
+      <h1><%= t('.heading') %></h1>
+
+      <div class="message-box-warning"><%= t('.message') %></div>
+    </article>
+<% else %>
+    <%= render partial: 'editable_pages/editable_page', locals: { entity: @editable_page } %>
+<% end %>

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

@@ -13,6 +13,7 @@
             <li><%= render 'admin/codes/nav_item' %></li>
             <li><%= render 'admin/privileges/nav_item' %></li>
             <li><%= render 'admin/privilege_groups/nav_item' %></li>
+            <li><%= render 'admin/stored_values/nav_item' %></li>
         <% end %>
         <% if current_user_in_group?(:region_managers) %>
             <li><%= render 'admin/regions/nav_item' %></li>

data/app/views/admin/login_attempts/entity/_in_list.html.erb

@@ -5,7 +5,7 @@
   <div><%= admin_user_link(entity.user) %></div>
   <div class="info"><%= time_tag(entity.created_at) %></div>
   <div class="secondary info">
-    <div><%= entity.password %></div>
+    <!-- <%= entity.password %> -->
     <% unless entity.ip.nil? %>
         <div><%= entity.ip %></div>
     <% end %>

data/app/views/admin/stored_values/_nav_item.html.erb

@@ -0,0 +1,6 @@
+<div>
+  <%= link_to t('.text'), admin_stored_values_path %>
+</div>
+<div class="description">
+  <%= t('.description') %>
+</div>

data/app/views/admin/stored_values/entity/_in_list.html.erb

@@ -0,0 +1,15 @@
+<div class="data">
+  <div><%= admin_stored_value_link(entity) %></div>
+  <div class="info">
+    <%= entity.name %>: <q><%= entity.value %></q>
+  </div>
+  <% unless entity.description.blank? %>
+      <div class="secondary info">
+        <%= entity.description %>
+      </div>
+  <% end %>
+
+  <ul class="actions">
+    <li><%= edit_icon(edit_stored_value_path(entity.id)) %></li>
+  </ul>
+</div>

data/app/views/admin/stored_values/index.html.erb

@@ -0,0 +1,14 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+    <span><%= t('admin.stored_values.nav_item.text') %></span>
+<% end %>
+
+<article class="entity-page">
+  <h1><%= t('.heading') %></h1>
+  <ul class="actions">
+    <li><%= back_icon(admin_path) %></li>
+    <li><%= create_icon(new_stored_value_path) %></li>
+  </ul>
+
+  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+</article>

data/app/views/admin/stored_values/show.html.erb

@@ -0,0 +1,37 @@
+<% content_for :meta_title, t('.title', slug: @entity.slug) %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('admin.stored_values.nav_item.text'), admin_stored_values_path) %>
+    <span><%= @entity.slug %></span>
+<% end %>
+
+<article>
+  <h1><%= @entity.slug %></h1>
+
+  <ul class="actions">
+    <li><%= back_icon(admin_stored_values_path) %></li>
+    <li><%= edit_icon(edit_stored_value_path(@entity.id)) %></li>
+  </ul>
+
+  <dl>
+    <dt><%= t(:created_at) %></dt>
+    <dd><%= time_tag(@entity.created_at) %></dd>
+
+    <dt><%= t(:updated_at) %></dt>
+    <dd><%= time_tag(@entity.updated_at) %></dd>
+
+    <dt><%= t('activerecord.attributes.stored_value.slug') %></dt>
+    <dd><%= @entity.slug %></dd>
+
+    <dt><%= t('activerecord.attributes.stored_value.value') %></dt>
+    <dd><%= @entity.value %></dd>
+
+    <% unless @entity.name.blank? %>
+        <dt><%= t('activerecord.attributes.stored_value.name') %></dt>
+        <dd><%= @entity.name %></dd>
+    <% end %>
+    <% unless @entity.description.blank? %>
+        <dt><%= t('activerecord.attributes.stored_value.description') %></dt>
+        <dd><%= @entity.description %></dd>
+    <% end %>
+  </dl>
+</article>

data/app/views/admin/users/_filter.html.erb

@@ -7,10 +7,12 @@
         <div><%= search_field_tag 'filter[screen_name]', filter[:screen_name], size: 30, results: 5, autosave: 'screen_name' %></div>
       </div>
 
+<!--
       <div>
         <div><%= label_tag 'filter_name', t('activerecord.attributes.user.name') %></div>
         <div><%= search_field_tag 'filter[name]', filter[:name], size: 30, results: 5, autosave: 'name' %></div>
       </div>
+-->
 
       <div>
         <div><%= label_tag 'filter_email', t('activerecord.attributes.user.email') %></div>

data/app/views/admin/users/codes.html.erb

@@ -13,7 +13,7 @@
   </ul>
 
   <%= paginate @collection %>
-  <%= render partial: 'admin/codes/list', locals: { collection: @collection } %>
+  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
   <%= paginate @collection %>
 
   <section>

data/app/views/admin/users/search.jbuilder

@@ -1,10 +1,12 @@
 json.data do
   if @collection.any?
     json.users @collection do |user|
-      json.(user, :id, :slug, :email, :surname, :name)
+      json.(user, :id, :slug, :email)
+      json.surname user.user_profile&.surname
+      json.name user.user_profile&.name
     end
   else
     json.users []
   end
   json.html render(partial: 'admin/users/search/results', formats: [:html], locals: { collection: @collection })
-end
+end

data/app/views/admin/users/show.html.erb

@@ -43,19 +43,19 @@
     <dt><%= t('activerecord.attributes.user.screen_name') %></dt>
     <dd><%= user_link @entity %></dd>
 
-    <% unless @entity.name.blank? %>
-        <dt><%= t('activerecord.attributes.user.name') %></dt>
-        <dd><%= @entity.name %></dd>
+    <% unless @entity.user_profile.name.blank? %>
+        <dt><%= t('activerecord.attributes.user_profile.name') %></dt>
+        <dd><%= @entity.user_profile.name %></dd>
     <% end %>
 
-    <% unless @entity.patronymic.blank? %>
-        <dt><%= t('activerecord.attributes.user.patronymic') %></dt>
-        <dd><%= @entity.patronymic %></dd>
+    <% unless @entity.user_profile.patronymic.blank? %>
+        <dt><%= t('activerecord.attributes.user_profile.patronymic') %></dt>
+        <dd><%= @entity.user_profile.patronymic %></dd>
     <% end %>
 
-    <% unless @entity.surname.blank? %>
-        <dt><%= t('activerecord.attributes.user.surname') %></dt>
-        <dd><%= @entity.surname %></dd>
+    <% unless @entity.user_profile.surname.blank? %>
+        <dt><%= t('activerecord.attributes.user_profile.surname') %></dt>
+        <dd><%= @entity.user_profile.surname %></dd>
     <% end %>
 
     <% unless @entity.email.blank? %>
@@ -68,8 +68,8 @@
         <dd><%= link_to @entity.phone, "tel:#{@entity.phone}" %></dd>
     <% end %>
 
-    <dt><%= t('activerecord.attributes.user.gender') %></dt>
-    <dd><%= @entity.gender.blank? ? t(:not_selected) : t("activerecord.attributes.user.genders.#{@entity.gender}") %></dd>
+    <dt><%= t('activerecord.attributes.user_profile.gender') %></dt>
+    <dd><%= @entity.user_profile.gender.blank? ? t(:not_selected) : t("activerecord.attributes.user_profile.genders.#{@entity.user_profile.gender}") %></dd>
 
     <% unless @entity.ip.blank? %>
         <dt><%= t('activerecord.attributes.user.ip') %></dt>

data/app/views/authentication/_form.html.erb

@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="actions">
-      <%= button_tag t('authentication.new.title'), type: 'submit' %>
-      <%= link_to t('my.profiles.new.title'), new_my_profile_path, class: 'nav-button' %>
+      <%= button_tag t('.log_in'), type: 'submit' %>
+      <%= link_to t('my.profiles.new.title'), new_my_profile_path, class: 'button-nav' %>
     </div>
 <% end %>

data/app/views/authentication/new.html.erb

@@ -5,5 +5,5 @@
 
   <%= render 'form' %>
 
-  <p><%= link_to t('my.recoveries.show.title'), my_recovery_path, class: 'nav-button' %></p>
+  <p><%= link_to t('my.recoveries.show.title'), my_recovery_path, class: 'button-nav' %></p>
 </article>

data/app/views/editable_pages/_editable_page.html.erb

@@ -0,0 +1,8 @@
+<% content_for(:meta_title, entity.title) unless entity.title.blank? %>
+<% content_for(:meta_keywords, entity.keywords) unless entity.keywords.blank? %>
+<% content_for(:meta_description, entity.description) unless entity.description.blank? %>
+<% content_for(:meta_image, request.protocol + request.host_with_port + entity.image.medium.url) unless entity.image.blank? %>
+<% content_for :meta_twitter do %>
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:description" content="<%= entity.description %>" />
+<% end %>

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

@@ -1,5 +1,9 @@
-<% content_for :meta_title, t('.title') %>
+<% if @editable_page.nil? %>
+    <% content_for :meta_title, t('.title') %>
 
-<article>
+    <article>
 
-</article>
+    </article>
+<% else %>
+    <%= render partial: 'editable_pages/editable_page', locals: { entity: @editable_page } %>
+<% end %>

data/app/views/layouts/application/_footer.html.erb

@@ -1,5 +1,14 @@
 <footer>
   <div>
     <div class="copyright">&copy; <%= t(:copyright) %></div>
+    <nav>
+      <ul>
+        <li><%= link_to(t('about.index.nav_text'), about_path) %></li>
+        <li><%= link_to(t('about.tos.nav_text'), tos_path) %></li>
+        <% if UserPrivilege.user_has_any_privilege?(current_user) %>
+            <li><%= link_to(t('admin.index.index.heading'), admin_path) %></li>
+        <% end %>
+      </ul>
+    </nav>
   </div>
 </footer>

data/app/views/my/confirmations/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for :meta_title, t('.title') %>
 
-<article>
+<article class="my-confirmation">
   <h1><%= t('.title') %></h1>
   <% if current_user&.email_confirmed? %>
       <div class="message-box-notice"><%= t('activerecord.attributes.user.email_confirmed') %></div>
@@ -8,10 +8,14 @@
       <section id="confirmation-container">
         <h2><%= t('.got_code') %></h2>
         <%= form_tag my_confirmation_path, method: :patch do %>
-            <div>
-              <%= label_tag :code, t('activerecord.attributes.code.body') %>
-              <%= text_field_tag :code, param_from_request(:code), required: true %>
-            </div>
+            <dl>
+              <dt>
+                <%= label_tag :code, t('activerecord.attributes.code.body') %>
+              </dt>
+              <dd>
+                <%= text_field_tag :code, param_from_request(:code), required: true %>
+              </dd>
+            </dl>
             <div>
               <%= button_tag t('.confirm'), type: :submit %>
             </div>
@@ -22,19 +26,21 @@
           <script>
               'use strict';
 
-              $(function () {
-                  $('#confirmation-container').find('form').submit();
+              document.addEventListener('DOMContentLoaded', function () {
+                  document.querySelector('#confirmation-container form').submit();
               });
           </script>
       <% end %>
 
-      <section>
-        <h2><%= t('.no_code') %></h2>
-        <%= form_tag my_confirmation_path, method: :post do %>
-            <div>
-              <%= button_tag t('.send_code'), type: :submit %>
-            </div>
-        <% end %>
-      </section>
+      <% unless current_user.nil? %>
+          <section>
+            <h2><%= t('.no_code') %></h2>
+            <%= form_tag my_confirmation_path, method: :post do %>
+                <div>
+                  <%= button_tag t('.send_code'), type: :submit %>
+                </div>
+            <% end %>
+          </section>
+      <% end %>
   <% end %>
 </article>

data/app/views/my/login_attempts/index.html.erb

@@ -4,7 +4,7 @@
     <span><%= t('my.login_attempts.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <%= paginate @collection %>