dorsale 3.7.8 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb41bb191b0f0774874ccda3e131cb20eea812c
-  data.tar.gz: c6dd41119b5126fbff10a4cd72224139cc15dde3
+  metadata.gz: 2cd9ee349fdefbfd043c9e528bc07e4f5be23c67
+  data.tar.gz: 1727d591ba6fe8a39da75b00adc47c6d1821c7ae
 SHA512:
-  metadata.gz: 3a5363b33345add30d2dc9e89aed9e4570b92b807f663da687cd3333f35436ad0a66cab48f6f6adbf86aed106192503ee941c710708c89b32c3bfbfc72ab743d
-  data.tar.gz: c78f2865a7de1834dd91396a0246c7c6c168564abe73ccce52dff0917c0141652b02f1269745d29719782f5149f546bd5dec0a0fd370bff180794da9dd085337
+  metadata.gz: 43382375849075fec61442b60ba94f676da7831588a1c66f4223504d747ff25fdfd3bdd53ad3c0a94521f2e3db1d67507a3d60df7cadfe827bbc32a100f6afba
+  data.tar.gz: 8e0c1a438c2fc23caab0da8dea58d584ffc4a6411fee720fc467806c7b53f313b28c2405d548398648e4ac9e767f2ed03e872e710cf142bf68c4d4c04d4cfd61

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next version
 
+## 3.8.0
+
+- Move CV comments to events
+- Add CV event contact type
+- Various fixes
+
 ## 3.7.8
 
 - Person build address improvement

data/app/assets/javascripts/dorsale/common/comments.coffee

@@ -9,7 +9,7 @@ window.dorsaleComments =
   setupCreateForm: ->
     $(document).on "ajax:success", "form#new-dorsale-comment", (e, data) ->
       if data.length
-        $(this).find("#comment_title, #comment_text").val("")
+        $(this).find("input[id$=title], textarea[id$=text]").val("")
         $(".dorsale-comments-list").prepend(data)
 
   setupEditForm: ->

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

@@ -19,17 +19,20 @@
     input, textarea
       font-size: $font-size-base
 
-    .comment-title-field
-      display: inline-block
-      width: calc(100% - 10rem - 0.5rem)
-      margin-right: 0.5rem
+    .comment-infos-fields
+      display: flex
 
-    .comment-date-field
-      display: inline-block
-      width: 10rem
+      > div + div
+        margin-left: 5px
 
-      input
-        text-align: center
+      .comment-title-field
+        flex: 1
+
+      .comment-contact_type-field
+        width: 8rem
+
+      .comment-date-field
+        width: 10rem
 
     .comment-text-field
       margin-top: 0.5rem

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

@@ -23,3 +23,6 @@ td[class*="count"],
 td[class*="total"],
 td[class*="amount"],
   text-align: right
+
+tr.inactive
+  background-color: #F5A9A9

data/app/controllers/dorsale/customer_vault/events_controller.rb

@@ -1,4 +1,8 @@
 class Dorsale::CustomerVault::EventsController < ::Dorsale::CustomerVault::ApplicationController
+  before_action :set_objects
+
+  layout -> { action_name == "index" ? nil : false }
+
   def index
     authorize model, :list?
 
@@ -10,9 +14,87 @@ class Dorsale::CustomerVault::EventsController < ::Dorsale::CustomerVault::Appli
     @events = @events.page(params[:page]).per(50)
   end
 
+  def create
+    @event ||= scope.new(event_params_for_create)
+
+    authorize @event, :create?
+
+    if @event.save
+      render_event
+    else
+      render_nothing
+    end
+  end
+
+  def edit
+    authorize @event, :update?
+  end
+
+  def update
+    authorize @event, :update?
+
+    if @event.update(event_params_for_update)
+      render_event
+    else
+      render_form
+    end
+  end
+
+  def destroy
+    authorize @event, :delete?
+
+    @event.destroy!
+
+    render_nothing
+  end
+
   private
 
   def model
     Dorsale::CustomerVault::Event
   end
+
+  def set_objects
+    @event = scope.find(params[:id]) if params.key?(:id)
+  end
+
+  def render_event
+    render partial: "event", locals: {event: @event}
+  end
+
+  def render_form
+    render partial: "form", locals: {event: @event}
+  end
+
+  def render_nothing
+    head :ok
+  end
+
+  def permitted_params
+    safe_params = [
+      :action,
+      :title,
+      :contact_type,
+      :date,
+      :text,
+    ]
+
+    if params[:action] == "create"
+      safe_params << :person_id
+    end
+
+    safe_params
+  end
+
+  def common_event_params
+    params.fetch(:event, {}).permit(permitted_params)
+  end
+
+  def event_params_for_create
+    common_event_params.merge(author: current_user)
+  end
+
+  def event_params_for_update
+    common_event_params
+  end
 end

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -189,7 +189,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
   end
 
   def set_owners
-    @owners ||= policy_scope(User).all
+    @owners ||= policy_scope(User).actives
   end
 
   def permitted_params

data/app/controllers/dorsale/users_controller.rb

@@ -8,7 +8,7 @@ class Dorsale::UsersController < ::Dorsale::ApplicationController
   def index
     authorize User, :list?
 
-    @users ||= scope.all
+    @users ||= scope.all.order(is_active: :desc)
   end
 
   def new

data/app/helpers/dorsale/comments_helper.rb

@@ -20,8 +20,8 @@ module Dorsale::CommentsHelper
     params[:controller].include?("customer_vault")
   end
 
-  def truncate_comment_text(comment)
-    text      = comment.text.to_s
+  def truncate_comment_text(text)
+    text      = text.to_s
     truncated = false
 
     if text.to_s.count("\n") > 3

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

@@ -46,4 +46,15 @@ module Dorsale::CustomerVault::ApplicationHelper
       [model.t("action.#{action}"), action]
     end
   end
+
+  def customer_vault_event_contact_types_for_filter_select
+    model = Dorsale::CustomerVault::Event
+    model::CONTACT_TYPES.map do |contact_type|
+      [model.t("contact_type.#{contact_type}"), contact_type]
+    end
+  end
+
+  def new_event_for(person)
+    policy_scope(Dorsale::CustomerVault::Event).new(person: person, author: current_user)
+  end
 end

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

@@ -1,23 +1,27 @@
 class Dorsale::CustomerVault::Event < ::Dorsale::ApplicationRecord
   self.table_name = :dorsale_customer_vault_events
 
-  ACTIONS = %w(create update comment)
+  ACTIONS       = %w(create update comment)
+  CONTACT_TYPES = %w(contact r1 r2)
 
   belongs_to :author,  class_name: User
   belongs_to :person,  class_name: Dorsale::CustomerVault::Person
-  belongs_to :comment, class_name: Dorsale::Comment
 
-  validates :person,  presence: true
-  validates :action,  presence: true, inclusion: {in: proc {ACTIONS} }
-  validates :comment, presence: true, if: proc { action == "comment" }
+  validates :person,       presence: true
+  validates :date,         presence: true
+  validates :text,         presence: true
+  validates :action,       presence: true,    inclusion: {in: proc {ACTIONS} }
+  validates :contact_type, allow_blank: true, inclusion: {in: proc {CONTACT_TYPES} }
 
   default_scope -> {
     all
       .order(created_at: :desc, id: :desc)
-      .preload(:author, :person, :comment)
+      .preload(:author, :person)
   }
 
-  def date
-    created_at.try(:to_date)
+  private
+
+  def assign_default_values
+    assign_default :date, Date.current
   end
 end

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

@@ -72,22 +72,4 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   def destroy_links
     links.each(&:destroy!)
   end
-
-  def receive_comment_notification(comment, action)
-    scope = Pundit.policy_scope!(comment.author, ::Dorsale::CustomerVault::Event)
-
-    if action == :create
-      scope.create!(
-        :author  => comment.author,
-        :person  => self,
-        :comment => comment,
-        :action  => "comment",
-      )
-    end
-
-    if action == :delete
-      scope.where(comment: comment).destroy_all
-    end
-  end
-
 end

data/app/models/dorsale/users/active.rb

@@ -3,6 +3,8 @@ module Dorsale::Users::Active
     user_model.class_eval do
       validates :is_active, inclusion: {in: [true, false]}
 
+      scope :actives, -> { where(is_active: true) }
+
       def initialize(*)
         super
         self.is_active = true if is_active.nil?

data/app/policies/dorsale/customer_vault/event_policy_helper.rb

@@ -1,5 +1,8 @@
 module Dorsale::CustomerVault::EventPolicyHelper
   POLICY_METHODS = [
     :list?,
+    :create?,
+    :update?,
+    :delete?,
   ]
 end

data/app/views/dorsale/billing_machine/invoices/_list.html.slim

@@ -10,6 +10,9 @@ table.default.invoices
       th
         = ::Dorsale::BillingMachine::Invoice.t(:customer)
 
+      th
+        = ::Dorsale::BillingMachine::Invoice.t(:label)
+
       th
         = ::Dorsale::BillingMachine::Invoice.t(:total_excluding_taxes)
 
@@ -31,6 +34,9 @@ table.default.invoices
         td.customer_name
           = link_to_object(invoice.customer)
 
+        td.invoice_label
+          = invoice.label
+
         td.total_excluding_taxes
           = bm_currency invoice.total_excluding_taxes
 

data/app/views/dorsale/billing_machine/quotations/_list.html.slim

@@ -10,6 +10,9 @@ table.default.quotations
       th
         = ::Dorsale::BillingMachine::Quotation.t(:customer)
 
+      th
+        = ::Dorsale::BillingMachine::Quotation.t(:label)
+
       th
         = ::Dorsale::BillingMachine::Quotation.t(:total_excluding_taxes)
 
@@ -34,6 +37,9 @@ table.default.quotations
         td.customer_name
           = link_to_object(quotation.customer)
 
+        td.quotation_label
+          = quotation.label
+
         td.total_excluding_taxes
           = bm_currency quotation.total_excluding_taxes
 

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

@@ -30,7 +30,7 @@
     span.comment-author
       = comment.author.to_s
 
-  - if truncate_comments_in_this_page? && text = truncate_comment_text(comment)
+  - if truncate_comments_in_this_page? && text = truncate_comment_text(comment.text)
     p.comment-text-truncated
       = text
       = " "

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

@@ -12,11 +12,12 @@
       = image_tag default_avatar_url, class: "avatar"
 
     .comment-fields
-      .comment-title-field
-        = f.text_field :title, class: "form-control input-sm", placeholder: f.object.t(:title)
+      .comment-infos-fields
+        .comment-title-field
+          = f.text_field :title, class: "form-control input-sm", placeholder: f.object.t(:title)
 
-      .comment-date-field
-        = f.text_field :date, class: "form-control input-sm", placeholder: f.object.t(:date)
+        .comment-date-field
+          = f.text_field :date, class: "form-control input-sm", placeholder: f.object.t(:date)
 
       .comment-text-field
         = f.text_area :text, rows: 3, class: "form-control input-sm", placeholder: f.object.t(:text)

data/app/views/dorsale/customer_vault/events/_action_comment.html.slim

@@ -0,0 +1,47 @@
+.comment id="comment#{event.id}"
+  - if event.author.try(:avatar_url).present?
+    = image_tag event.author.avatar_url, class: "avatar"
+  - else
+    = image_tag default_avatar_url, class: "avatar"
+
+  p.comment-actions
+    - if policy(event).update?
+      = icon_link_to :pencil, t("actions.edit"), dorsale.edit_customer_vault_event_path(event), class: "edit-dorsale-comment"
+
+    - if policy(event).delete?
+      = icon_link_to :trash, t("actions.delete"), dorsale.customer_vault_event_path(event), class: "delete-dorsale-comment", method: :delete, remote: true, data: {confirm: t("actions.confirm")}
+
+  p.comment-infos
+    span.comment-commentable-container
+      span.comment-commentable = link_to_object(event.person)
+      span.comment-separator   = " - "
+
+    - if event.title.present?
+      span.title-container
+        strong.title  = event.title
+        span.separator = " - "
+
+    - if event.contact_type.present?
+      span.contact_type-container
+        strong.contact_type  = event.tv(:contact_type)
+        span.separator = " - "
+
+    span.comment-date
+      = date(event.date)
+
+    = " "
+    = event.t(:written_by)
+    = " "
+    span.comment-author
+      = event.author.to_s
+
+  - if truncate_comments_in_this_page? && text = truncate_comment_text(event.text)
+    p.comment-text-truncated
+      = text
+      = " "
+      a.comment-show_more href="#"
+        = ta(:show_more)
+
+  p.comment-text = text2html(event.text)
+
+  .clearfix

data/app/views/dorsale/customer_vault/events/_action_other.html.slim

@@ -0,0 +1,24 @@
+.event id="event#{event.id}"
+  - if event.author.try(:avatar_url).present?
+    = image_tag event.author.avatar_url, class: "avatar"
+  - else
+    = image_tag default_avatar_url, class: "avatar"
+
+  p.event-infos
+    span.event-person-container
+      span.event-person = link_to_object(event.person)
+      span.event-separator   = " - "
+
+    span.event-date
+      = date(event.date)
+
+    - if event.author
+      = " "
+      = event.t(:authored_by)
+      = " "
+      span.event-author
+        = event.author.to_s
+
+  p.event-text = text2html(event.text)
+
+  .clearfix

data/app/views/dorsale/customer_vault/events/_event.html.slim

@@ -1,24 +1,4 @@
-.event id="event#{event.id}"
-  - if event.author.try(:avatar_url).present?
-    = image_tag event.author.avatar_url, class: "avatar"
-  - else
-    = image_tag default_avatar_url, class: "avatar"
-
-  p.event-infos
-    span.event-person-container
-      span.event-person = link_to_object(event.person)
-      span.event-separator   = " - "
-
-    span.event-date
-      = date(event.date)
-
-    - if event.author
-      = " "
-      = event.t(:authored_by)
-      = " "
-      span.event-author
-        = event.author.to_s
-
-  p.event-text = text2html(event.text)
-
-  .clearfix
+- if event.action == "comment"
+  = render "dorsale/customer_vault/events/action_comment", event: event
+- else
+  = render "dorsale/customer_vault/events/action_other", event: event

data/app/views/dorsale/customer_vault/events/_form.html.slim

@@ -0,0 +1,32 @@
+- id = "new-dorsale-comment"  if event.new_record?
+- id = "edit-dorsale-comment" if event.persisted?
+
+= simple_form_for [dorsale, event], remote: true, as: :event, html: {id: id} do |f|
+  = f.hidden_field :person_id
+  = f.hidden_field :action, value: (f.object.action.presence || "comment")
+
+  .comment
+    - if event.author.try(:avatar_url).present?
+      = image_tag event.author.avatar_url, class: "avatar"
+    - else
+      = image_tag default_avatar_url, class: "avatar"
+
+    .comment-fields
+      .comment-infos-fields
+        .comment-title-field
+          = f.text_field :title, class: "form-control input-sm", placeholder: f.object.t(:title)
+
+        .comment-contact_type-field
+          = f.select :contact_type, customer_vault_event_contact_types_for_filter_select, {include_blank: true}, class: "form-control input-sm"
+
+        .comment-date-field
+          = f.text_field :date, class: "form-control input-sm", placeholder: f.object.t(:date)
+
+
+      .comment-text-field
+        = f.text_area :text, rows: 3, class: "form-control input-sm", placeholder: f.object.t(:text)
+
+      .comment-submit
+        input type="submit" value=t("actions.send") class="btn btn-success btn-xs"
+
+    .clearfix

data/app/views/dorsale/customer_vault/events/_list.html.slim

@@ -1,6 +1,3 @@
 .dorsale-events-list.dorsale-comments-list
   - events.each do |event|
-    - if event.comment
-      = render "dorsale/comments/comment", comment: event.comment
-    - else
-      = render "dorsale/customer_vault/events/event", event: event
+    = render "dorsale/customer_vault/events/event", event: event

data/app/views/dorsale/customer_vault/events/edit.html.slim

@@ -0,0 +1 @@
+= render "dorsale/customer_vault/events/form", event: @event

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

@@ -1,6 +1,6 @@
 - if policy(::Dorsale::CustomerVault::Person).create?
-  = create_button dorsale.new_customer_vault_individual_path, action: :new_individual
-  = create_button dorsale.new_customer_vault_corporation_path, action: :new_corporation
+  = create_button dorsale.new_customer_vault_individual_path, action: :new_individual, icon: "user-plus"
+  = create_button dorsale.new_customer_vault_corporation_path, action: :new_corporation, icon: "users"
 
 - if @people_without_pagination && policy(model).export?
   = export_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"

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

@@ -1,5 +1,5 @@
 - content_for :page_body
-  = render "dorsale/comments/form", comment: new_comment_for(@person)
+  = render "dorsale/customer_vault/events/form", event: new_event_for(@person)
   = render "dorsale/customer_vault/events/list", events: @person.self_and_related_events
 
   - if @person.try(:context).present?

data/app/views/dorsale/users/_list.html.slim

@@ -8,7 +8,8 @@ table#users-list.default
 
   tbody
     - users.each do |user|
-      tr.user
+      - active_class = user.is_active? ? "active" : "inactive hidden"
+      tr.user class=active_class
         td.user-avatar
           = avatar_img(user)
 

data/app/views/dorsale/users/index.html.slim

@@ -10,4 +10,20 @@
   - content_for :table
     = render "dorsale/users/list", users: @users
 
+  - content_for :page_footer
+    .text-center = link_to "Afficher les inactifs", "#", class: "show_inactives_link"
+
   = render_dorsale_page
+
+coffee:
+  $(document).on "turbolinks:load", ->
+    show_text = "Afficher les inactifs"
+    hide_text = "Masquer les inactifs"
+    $(".show_inactives_link").click (event)->
+      event.preventDefault()
+      if $(this).text() == hide_text
+        $(".user.inactive").addClass("hidden")
+        $(this).text(show_text)
+      else
+        $(".user.inactive").removeClass("hidden")
+        $(this).text(hide_text)

data/config/locales/customer_vault.en.yml

@@ -111,10 +111,15 @@ en:
         person: "Person"
         authored_by: "by"
         all_actions: "All types"
+        contact_type: "Contact type"
       dorsale/customer_vault/event/action:
         create: "Create"
         update: "Update"
         comment: "Comment"
+      dorsale/customer_vault/event/contact_type:
+        contact: "Contact"
+        r1: "R1"
+        r2: "R2"
       dorsale/customer_vault/event/text:
         create: "Creation of the person"
         update: "Update person informations"

data/config/locales/customer_vault.fr.yml

@@ -110,10 +110,15 @@ fr:
         person: "Personne"
         authored_by: "par"
         all_actions: "Tous les types"
+        contact_type: "Type de contact"
       dorsale/customer_vault/event/action:
         create: "Création"
         update: "Modification"
         comment: "Commentaire"
+      dorsale/customer_vault/event/contact_type:
+        contact: "Contact"
+        r1: "R1"
+        r2: "R2"
       dorsale/customer_vault/event/text:
         create: "Création de la personne"
         update: "Mise à jour des informations de la personne"

data/config/routes.rb

@@ -58,7 +58,7 @@ Dorsale::Engine.routes.draw do
     resources :activity_types, except: [:destroy, :show]
     resources :origins, except: [:destroy, :show]
 
-    resources :events, only: [:index]
+    resources :events, only: [:index, :create, :edit, :update, :destroy]
 
     resources :people do
       resources :links

data/db/migrate/20171023080507_migrate_people_comments_to_events.rb

@@ -0,0 +1,22 @@
+class MigratePeopleCommentsToEvents < ActiveRecord::Migration[5.0]
+  class Event < ::Dorsale::ApplicationRecord
+    self.table_name = :dorsale_customer_vault_events
+
+    belongs_to :comment, class_name: Dorsale::Comment
+  end
+
+  def change
+    add_column :dorsale_customer_vault_events, :title, :string
+    add_column :dorsale_customer_vault_events, :date, :date
+
+    Event.where(action: "comment").each do |event|
+      event.title = event.comment.title
+      event.text  = event.comment.text
+      event.date  = event.comment.date
+      event.save!
+      event.comment.destroy!
+    end
+
+    remove_column :dorsale_customer_vault_events, :comment_id
+  end
+end

data/db/migrate/20171023133219_customer_vault_events_add_contact_type.rb

@@ -0,0 +1,5 @@
+class CustomerVaultEventsAddContactType < ActiveRecord::Migration[5.0]
+  def change
+    add_column :dorsale_customer_vault_events, :contact_type, :string
+  end
+end

data/features/customer_vault_corporations.feature

@@ -53,25 +53,25 @@ Feature: Manage corporations
   Scenario: Add a comment to a corporation
     Given an existing corporation
     When I go on this corporation
-    And I add a comment
+    And I add a comment on the person
     Then I am on the corporation page
-    And I see my new comment
+    And I see my new comment on the person
 
   Scenario: Update comment on a corporation
     Given an existing corporation
     And an existing comment on this corporation
     When I go on this corporation
-    And I update the comment
+    And I update the comment on the person
     Then I am on the corporation page
-    And I see my updated comment
+    And I see my updated comment on the person
 
   Scenario: Delete comment on a corporation
     Given an existing corporation
     And an existing comment on this corporation
     When I go on this corporation
-    And I delete the comment
+    And I delete the comment on the person
     Then I am on the corporation page
-    And I see do not see my comment
+    And I see do not see my comment on the person
 
   Scenario: People activity
     Given an existing individual with recent comments

data/features/step_definitions/customer_vault_corporations_steps.rb

@@ -65,54 +65,54 @@ When(/^I go on this corporation$/) do
   visit dorsale.customer_vault_corporation_path(@corporation)
 end
 
-When(/^I add a comment$/) do
-  @comments_count = Dorsale::Comment.count
-  fill_in "comment_text", with: "MyNewComment"
+When(/^I add a comment on the person$/) do
+  @events_count = Dorsale::CustomerVault::Event.count
+  fill_in "event_text", with: "MyNewComment"
   find("[type=submit]").click
 end
 
-Then(/^I see my new comment$/) do
-  expect(Dorsale::Comment.count).to eq(@comments_count + 1)
+Then(/^I see my new comment on the person$/) do
+  expect(Dorsale::CustomerVault::Event.count).to eq(@events_count + 1)
 
   expect(find("p.comment-text")).to have_content "MyNewComment"
 end
 
 Given(/^an existing comment on this corporation$/) do
-  @comment = create(:dorsale_comment, commentable: @corporation)
+  @event = create(:customer_vault_event_comment, person: @corporation)
 end
 
-When(/^I update the comment$/) do
+When(/^I update the comment on the person$/) do
   find(".comment [href*=edit]").click
   within "form[id*=edit]" do
-    fill_in :comment_text, with: "MyUpdatedComment"
+    fill_in :event_text, with: "MyUpdatedComment"
     find("[type=submit]").click
   end
 end
 
-Then(/^I see my updated comment$/) do
+Then(/^I see my updated comment on the person$/) do
   expect(find("p.comment-text")).to have_content "MyUpdatedComment"
 end
 
-When(/^I delete the comment$/) do
-  @comments_count = Dorsale::Comment.count
+When(/^I delete the comment on the person$/) do
+  @events_count = Dorsale::CustomerVault::Event.count
   find(".comment [data-method*=delete]").click
 end
 
-Then(/^I see do not see my comment$/) do
-  expect(Dorsale::Comment.count).to eq(@comments_count - 1)
-  expect(page).to have_no_content @comment.text
+Then(/^I see do not see my comment on the person$/) do
+  expect(Dorsale::CustomerVault::Event.count).to eq(@events_count - 1)
+  expect(page).to have_no_content @event.text
 end
 
 Given(/^an existing individual with recent comments$/) do
   @individual = create(:customer_vault_individual)
-  create(:dorsale_comment, commentable: @individual, text: "individual-comment-1")
-  create(:dorsale_comment, commentable: @individual, text: "individual-comment-2")
+  create(:customer_vault_event_comment, person: @individual, text: "individual-comment-1")
+  create(:customer_vault_event_comment, person: @individual, text: "individual-comment-2")
 end
 
 Given(/^an existing corporation with recent comments$/) do
   @corporation = create(:customer_vault_corporation)
-  create(:dorsale_comment, commentable: @corporation, text: "corporation-comment-1")
-  create(:dorsale_comment, commentable: @corporation, text: "corporation-comment-2")
+  create(:customer_vault_event_comment, person: @corporation, text: "corporation-comment-1")
+  create(:customer_vault_event_comment, person: @corporation, text: "corporation-comment-2")
 end
 
 When(/^I go on the people activity$/) do
@@ -130,7 +130,7 @@ Given(/^an existing corporation with (\d+) comments$/) do |n|
   step "an existing corporation"
 
   n.to_i.times do
-    create(:dorsale_comment, commentable: @corporation)
+    create(:customer_vault_event_comment, person: @corporation)
   end
 end
 

data/features/step_definitions/customer_vault_people_steps.rb

@@ -7,7 +7,7 @@ Then(/^the file is downloaded$/) do
 end
 
 Given(/^a very long comment on this person$/) do
-  @comment = create(:dorsale_comment, commentable: @person, text: Faker::Lorem.paragraph(10))
+  @comment = create(:customer_vault_event_comment, person: @person, text: Faker::Lorem.paragraph(10))
 end
 
 Then(/^I see the truncated comment$/) do
@@ -21,5 +21,5 @@ Then(/^I see the full comment$/) do
 end
 
 Given(/^a short comment on this person$/) do
-  @comment = create(:dorsale_comment, commentable: @person, text: "i am short")
+  @comment = create(:customer_vault_event_comment, person: @person, text: "i am short")
 end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.7.8"
+  VERSION = "3.8.0"
 end

data/spec/controllers/dorsale/comments_controller_spec.rb

@@ -29,20 +29,6 @@ describe Dorsale::CommentsController, type: :controller do
       post :create, params: valid_params
       expect(response).to redirect_to("/")
     end
-
-    describe "on person" do
-      it "should create an event" do
-        expect {
-          post :create, params: valid_params
-        }.to change(Dorsale::CustomerVault::Event, :count).by(1)
-
-        event = Dorsale::CustomerVault::Event.last_created
-        expect(event.author).to eq user
-        expect(event.person).to eq commentable
-        expect(event.comment).to eq Dorsale::Comment.last_created
-        expect(event.action).to eq "comment"
-      end
-    end # describe "on person"
   end
 
   describe "update" do
@@ -60,18 +46,5 @@ describe Dorsale::CommentsController, type: :controller do
       delete :destroy, params: {id: comment, back_url: "/"}
       expect(response).to redirect_to("/")
     end
-
-    describe "on person" do
-      it "should delete event" do
-        person  = create(:customer_vault_corporation)
-        comment = create(:dorsale_comment, commentable: person)
-        event   = create(:customer_vault_event, person: person, comment: comment, action: "comment")
-
-        delete :destroy, params: {id: comment}
-
-        expect { comment.reload }.to raise_error(ActiveRecord::RecordNotFound)
-        expect { event.reload   }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end # describe "on person"
   end
 end

data/spec/factories/customer_vault_event.rb

@@ -3,5 +3,11 @@ FactoryGirl.define do
     author { build(:user)                       }
     person { build(:customer_vault_corporation) }
     action { "create"                           }
+    text   { "Création de la personne"          }
+  end
+
+  factory :customer_vault_event_comment, parent: :customer_vault_event do
+    action { "comment"                }
+    text   { "Je suis un commentaire" }
   end
 end

data/spec/factories/dorsale_comments.rb

@@ -3,11 +3,5 @@ FactoryGirl.define do
     commentable { create(:customer_vault_corporation) }
     author      { create(:user)                       }
     text        { Faker::Lorem.paragraph              }
-
-    after(:create) do |comment|
-      if comment.commentable.is_a?(Dorsale::CustomerVault::Person)
-        comment.commentable.receive_comment_notification(comment, :create)
-      end
-    end
   end
 end

data/spec/models/dorsale/comment_spec.rb

@@ -15,13 +15,6 @@ RSpec.describe Dorsale::Comment, type: :model do
     it "should have a valid factory" do
       expect(create(:dorsale_comment)).to be_valid
     end
-
-    it "should create an event if commentable is a person" do
-      person = create(:customer_vault_corporation)
-      expect {
-        comment = create(:dorsale_comment, commentable: person)
-      }.to change(Dorsale::CustomerVault::Event, :count).by(1)
-    end
   end # describe "factories"
 
   describe "default values" do

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

@@ -3,18 +3,12 @@ require 'rails_helper'
 RSpec.describe ::Dorsale::CustomerVault::Event, type: :model do
   it { is_expected.to belong_to :author }
   it { is_expected.to belong_to :person }
-  it { is_expected.to belong_to :comment }
 
   it { is_expected.to validate_presence_of :person }
   it { is_expected.to validate_presence_of :action }
 
   it { is_expected.to_not validate_presence_of :author }
-  it { is_expected.to_not validate_presence_of :comment }
-
-  it "should validate comment if action is comment" do
-    event = described_class.new(action: "comment")
-    expect(event).to validate_presence_of :comment
-  end
+  it { is_expected.to_not validate_presence_of :contact_type }
 
   it "should have a valid factory" do
     event = create(:customer_vault_event)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.7.8
+  version: 3.8.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -716,9 +716,13 @@ files:
 - app/views/dorsale/customer_vault/activity_types/index.html.slim
 - app/views/dorsale/customer_vault/activity_types/new.html.slim
 - app/views/dorsale/customer_vault/corporations/_context.html.slim
+- app/views/dorsale/customer_vault/events/_action_comment.html.slim
+- app/views/dorsale/customer_vault/events/_action_other.html.slim
 - app/views/dorsale/customer_vault/events/_event.html.slim
 - app/views/dorsale/customer_vault/events/_filters.html.slim
+- app/views/dorsale/customer_vault/events/_form.html.slim
 - app/views/dorsale/customer_vault/events/_list.html.slim
+- app/views/dorsale/customer_vault/events/edit.html.slim
 - app/views/dorsale/customer_vault/events/index.html.slim
 - app/views/dorsale/customer_vault/individuals/_context.html.slim
 - app/views/dorsale/customer_vault/links/edit.html.slim
@@ -855,6 +859,8 @@ files:
 - db/migrate/20170427083541_remove_useless_polymorphic_belongs_to.rb
 - db/migrate/20170427093507_add_origin_and_activity_type_to_customer_vault_people.rb
 - db/migrate/20170915070538_dorsale_customer_vault_events_add_text.rb
+- db/migrate/20171023080507_migrate_people_comments_to_events.rb
+- db/migrate/20171023133219_customer_vault_events_add_contact_type.rb
 - features/access.feature
 - features/billing_machine_id_cards.feature
 - features/billing_machine_invoices.feature