dorsale 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8fd76e9602e5d327405b05c83df5f45a94d0b02
-  data.tar.gz: 3b7282e1f9d793d5dc0f687603051f816791e488
+  metadata.gz: 91e5341eb8cfffe13a70e3a8ee82da977139c0a2
+  data.tar.gz: 1f9010dd33f9a3e4ed88e3fea11ce31dd530c36d
 SHA512:
-  metadata.gz: 9fc09fc9312276e737bf174326c9abd95199105c81e76fa26e3ed65330d5c0c264e88624db0acf38eaed1b58f79db1917d7fe3bf9021fc14e5687957f1ef4a3e
-  data.tar.gz: cfcedff1fe60c18667cc417a525a8f2257a72dbe8dca2fc6cd8415c94a4285f7147563b3009b1b1538d59e34f1eee2c72c45905cc75b69d76be1ab2a04fafc8c
+  metadata.gz: 7ab4ad3cfed29a2ca2a86fde75db9ddf1a1d2bf038bc64e8b790c5afa3896f59c7f9f6e044eee91aa92513e1cf47c3642cbcd784a0e1a9c38d8e0ec31d7936d6
+  data.tar.gz: 8b4980ddc931a658e670d68a7834ef3bf76fd0510a1936e9c5fb292fcc93e8deafd18ca197a993d474b4d61cde6aa0c76c83b45f28063dad89a04d4792876926

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.5.2
+
+- Comments improvements
+- Add infos to people context
+
 ## 3.5.1
 
 - Add title and date to comments

data/app/assets/stylesheets/dorsale/common/comments.sass

@@ -16,6 +16,9 @@
   .comment-fields
     margin-left: 65px
 
+    input, textarea
+      font-size: $font-size-base
+
     .comment-title-field
       display: inline-block
       width: calc(100% - 10rem - 0.5rem)
@@ -52,7 +55,8 @@
       font-size: 80%
       margin-left: 1.5rem
 
-  p.comment-text
+  p.comment-text,
+  p.comment-text-truncated,
     margin: 1rem 0 0 65px
 
   p.comment-text-truncated + p.comment-text

data/app/helpers/dorsale/all_helpers.rb

@@ -7,6 +7,7 @@ module Dorsale::AllHelpers
   include ::Dorsale::CommentsHelper
   include ::Dorsale::Alexandrie::AttachmentsHelper
   include ::Dorsale::BillingMachine::ApplicationHelper
+  include ::Dorsale::CustomerVault::ApplicationHelper
   include ::Dorsale::Flyboy::ApplicationHelper
   include ::Dorsale::ExpenseGun::ApplicationHelper
   include ::Dorsale::UsersHelper

data/app/helpers/dorsale/comments_helper.rb

@@ -1,10 +1,8 @@
 module Dorsale::CommentsHelper
-  def comments_for(commentable, options = {})
-    comments = policy_scope(::Dorsale::Comment)
-      .where(commentable: commentable)
-      .preload(:commentable, :author)
-
-    new_comment = comments.new(author: current_user)
+  def comments_for(commentable, comments = nil)
+    comments    = ::Dorsale::Comment.where(commentable: commentable) if comments.nil?
+    comments    = policy_scope(comments).preload(:commentable, :author)
+    new_comment = policy_scope(comments).new(commentable: commentable, author: current_user)
 
     render(
       :partial => "dorsale/comments/comments",
@@ -15,7 +13,24 @@ module Dorsale::CommentsHelper
     )
   end
 
-  def truncate_comment_text?
-    controller_name == "people" && action_name == "activity"
+  def truncate_comments_in_this_page?
+    controller_name == "people"
+  end
+
+  def truncate_comment_text(comment)
+    text      = comment.text.to_s
+    truncated = false
+
+    if text.to_s.count("\n") > 3
+      text      = text.split("\n")[0, 3].join("\n")
+      truncated = true
+    end
+
+    if text.to_s.length > 300
+      text      = truncate(text, length: 200)
+      truncated = true
+    end
+
+    text2html(text) if truncated
   end
 end

data/app/helpers/dorsale/customer_vault/application_helper.rb

@@ -13,4 +13,30 @@ module Dorsale::CustomerVault::ApplicationHelper
       [Dorsale::CustomerVault::Individual.t,  "Dorsale::CustomerVault::Individual"],
     ]
   end
+
+  def person_address_blank?(person)
+    [
+      person.address.street,
+      person.address.street_bis,
+      person.address.zip,
+      person.address.city,
+      person.address.country,
+    ].all?(&:blank?)
+  end
+
+  def person_social_blank?(person)
+    [
+      person.skype,
+      person.www,
+      person.twitter,
+      person.facebook,
+      person.linkedin,
+      person.viadeo,
+      person.try(:societe_com),
+    ].all?(&:blank?)
+  end
+
+  def person_related_people_blank?(person)
+    person.individuals.empty?
+  end
 end

data/app/models/dorsale/comment.rb

@@ -9,7 +9,7 @@ class Dorsale::Comment < ::Dorsale::ApplicationRecord
 
   default_scope -> {
     all
-      .order(date: :desc, created_at: :desc)
+      .order(created_at: :desc, id: :desc)
       .preload(:author)
   }
 

data/app/models/dorsale/customer_vault/corporation.rb

@@ -5,6 +5,10 @@ class Dorsale::CustomerVault::Corporation < Dorsale::CustomerVault::Person
   validates :corporation_name, presence: true
   has_many :individuals
 
+  def self_and_related_comments
+    ::Dorsale::Comment.where(commentable: [self] + individuals)
+  end
+
   def name
     corporation_name
   end

data/app/models/dorsale/customer_vault/individual.rb

@@ -6,6 +6,10 @@ class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
   validates :last_name,  presence: true
   belongs_to :corporation
 
+  def self_and_related_comments
+    comments
+  end
+
   def name
     [self.last_name, self.first_name].join(", ")
   end

data/app/models/dorsale/customer_vault/person.rb

@@ -20,7 +20,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
 
   acts_as_taggable
 
-  has_many :comments, -> { order(created_at: :desc, id: :desc) }, class_name: ::Dorsale::Comment, as: :commentable, dependent: :destroy
+  has_many :comments, class_name: ::Dorsale::Comment, as: :commentable, dependent: :destroy
   has_one :address, class_name: ::Dorsale::Address, as: :addressable, inverse_of: :addressable, dependent: :destroy
   has_many :tasks, class_name: ::Dorsale::Flyboy::Task, as: :taskable, dependent: :destroy
   has_many :invoices, class_name: ::Dorsale::BillingMachine::Invoice, as: :customer

data/app/views/dorsale/comments/_comment.html.slim

@@ -30,9 +30,9 @@
     span.comment-author
       = comment.author.to_s
 
-  - if truncate_comment_text? && comment.text.length > 300
+  - if truncate_comments_in_this_page? && text = truncate_comment_text(comment)
     p.comment-text-truncated
-      = truncate(comment.text, length: 200)
+      = text
       = " "
       a.comment-show_more href="#"
         = ta(:show_more)

data/app/views/dorsale/customer_vault/people/_context.html.slim

@@ -9,11 +9,10 @@
 
   .context-body
     p.text-center = avatar_img(person)
-    = render "dorsale/customer_vault/people/context_general", person: person
-    hr
-    = render "dorsale/customer_vault/people/context_address", person: person
-    hr
-    = render 'dorsale/customer_vault/people/context_social', person: person
+    = render "dorsale/customer_vault/people/context_general",        person: person
+    = render "dorsale/customer_vault/people/context_related_people", person: person
+    = render "dorsale/customer_vault/people/context_address",        person: person
+    = render 'dorsale/customer_vault/people/context_social',         person: person
 
   .context-footer
     = actions_for(person)

data/app/views/dorsale/customer_vault/people/_context_address.html.slim

@@ -1,6 +1,8 @@
-- address = person.address
-= info address, :street
-= info address, :street_bis
-= info address, :city
-= info address, :zip
-= info address, :country
+.sub-context class=("blank" if person_address_blank?(person))
+  hr
+  - address = person.address
+  = info address, :street
+  = info address, :street_bis
+  = info address, :city
+  = info address, :zip
+  = info address, :country

data/app/views/dorsale/customer_vault/people/_context_general.html.slim

@@ -1,5 +1,11 @@
-= info person, :tags,     tags(person)
-= info person, :email,    helper: :email_link
-= info person, :phone,    helper: :tel_link
-= info person, :mobile,   helper: :tel_link
-= info person, :fax,      helper: :tel_link
+.sub-context
+  = info person, :tags, tags(person)
+
+  - if person.individual?
+    = info person, :corporation, helper: :link_to_object
+    = info person, :title
+
+  = info person, :email,  helper: :email_link
+  = info person, :phone,  helper: :tel_link
+  = info person, :mobile, helper: :tel_link
+  = info person, :fax,    helper: :tel_link

data/app/views/dorsale/customer_vault/people/_context_related_people.slim

@@ -0,0 +1,5 @@
+- return unless person.corporation?
+
+.sub-context class=("blank" if person_related_people_blank?(person))
+  hr
+  = info person, :individuals, person.individuals.map { |i| link_to_object(i) }.join(tag(:br)).html_safe

data/app/views/dorsale/customer_vault/people/_context_social.html.slim

@@ -1,6 +1,11 @@
-= info person, :skype,    helper: :email_link
-= info person, :www,      helper: :web_link
-= info person, :twitter,  helper: :web_link
-= info person, :facebook, helper: :web_link
-= info person, :linkedin, helper: :web_link
-= info person, :viadeo,   helper: :web_link
+.sub-context class=("blank" if person_social_blank?(person))
+  hr
+  = info person, :skype,    helper: :email_link
+  = info person, :www,      helper: :web_link
+  = info person, :twitter,  helper: :web_link
+  = info person, :facebook, helper: :web_link
+  = info person, :linkedin, helper: :web_link
+  = info person, :viadeo,   helper: :web_link
+
+  - if person.corporation?
+    = info person, :societe_com, helper: :web_link

data/app/views/dorsale/customer_vault/people/show.html.slim

@@ -1,5 +1,5 @@
 - content_for :page_body
-  = comments_for(@person)
+  = comments_for(@person, @person.self_and_related_comments)
 
   - if @person.try(:context).present?
     .panel.panel-default: .panel-body = text2html(@person.context)

data/config/locales/customer_vault.en.yml

@@ -67,6 +67,8 @@ en:
         legal_form: "Legal form"
         count: "Number of people"
         person_type: "Type"
+        title: "Title"
+        individuals: "Individuals"
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes
       dorsale/customer_vault/corporation:

data/config/locales/customer_vault.fr.yml

@@ -68,6 +68,7 @@ fr:
         count: "Nombre de contacts"
         person_type: "Type"
         title: "Fonction"
+        individuals: "Individus"
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes
       dorsale/customer_vault/corporation:

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.5.1"
+  VERSION = "3.5.2"
 end

data/spec/models/dorsale/customer_vault/person_spec.rb

@@ -24,7 +24,16 @@ RSpec.describe ::Dorsale::CustomerVault::Person, type: :model do
         expect { link.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
-
   end # describe '#links'
 
+  it "should return self_and_related_comments" do
+    corporation         = create(:customer_vault_corporation)
+    individual          = create(:customer_vault_individual, corporation: corporation)
+    corporation_comment = create(:dorsale_comment, commentable: corporation)
+    individual_comment  = create(:dorsale_comment, commentable: individual)
+
+    expect(corporation.self_and_related_comments).to contain_exactly(corporation_comment, individual_comment)
+    expect(individual.self_and_related_comments).to contain_exactly(individual_comment)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -703,6 +703,7 @@ files:
 - app/views/dorsale/customer_vault/people/_context.html.slim
 - app/views/dorsale/customer_vault/people/_context_address.html.slim
 - app/views/dorsale/customer_vault/people/_context_general.html.slim
+- app/views/dorsale/customer_vault/people/_context_related_people.slim
 - app/views/dorsale/customer_vault/people/_context_social.html.slim
 - app/views/dorsale/customer_vault/people/_data_context.html.slim
 - app/views/dorsale/customer_vault/people/_filters.html.slim