dorsale 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e5341eb8cfffe13a70e3a8ee82da977139c0a2
-  data.tar.gz: 1f9010dd33f9a3e4ed88e3fea11ce31dd530c36d
+  metadata.gz: aecc5956667a15cbe2f9141ba8b3f4fb10166639
+  data.tar.gz: 73a2f249fc10462d3ee1e1a74825f8d66833c85e
 SHA512:
-  metadata.gz: 7ab4ad3cfed29a2ca2a86fde75db9ddf1a1d2bf038bc64e8b790c5afa3896f59c7f9f6e044eee91aa92513e1cf47c3642cbcd784a0e1a9c38d8e0ec31d7936d6
-  data.tar.gz: 8b4980ddc931a658e670d68a7834ef3bf76fd0510a1936e9c5fb292fcc93e8deafd18ca197a993d474b4d61cde6aa0c76c83b45f28063dad89a04d4792876926
+  metadata.gz: bb9dcf6ade68da4dd3fc4248c84d57f890e32e64923892197e3a0f39f5141ea65ccc06992e01d13217787989f1db51a22d722c3d7a529e029aff8a3aa040b914
+  data.tar.gz: 6ff17588e48f01f0d36fb51d4f762b682ead1d92d7c70ab57967ee3b050c58613e30d253ecc48f58be7dbe63aefef5353e69dcfd81131ac34749900dfeacac87

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.6.0
+
+- Task term and reminder improvements
+- Add CustomerVault events
+
 ## 3.5.2
 
 - Comments improvements

data/Rakefile

@@ -10,7 +10,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Dorsale'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -18,21 +18,20 @@ APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
+load 'rails/tasks/statistics.rake'
 
-Bundler::GemHelper.install_tasks
 
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
+require 'bundler/gem_tasks'
 
-if Rails.env.test?
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
 
-  desc "Run all specs in spec directory (excluding plugin specs)"
-  RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-  task :default => :spec
-else
-  require File.expand_path('../spec/dummy/config/application', __FILE__)
-  Rails.application.load_tasks
-end
+task default: :test

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

@@ -7,17 +7,17 @@ window.dorsaleComments =
     dorsaleComments.setupShowMoreLinks()
 
   setupCreateForm: ->
-    $("#dorsale-comments").on "ajax:success", "form[id*=new]", (e, data) ->
+    $(document).on "ajax:success", "form#new-dorsale-comment", (e, data) ->
       if data.length
-        $(this).find("textarea").val("")
-        $("#dorsale-comments-list").prepend(data)
+        $(this).find("#comment_title, #comment_text").val("")
+        $(".dorsale-comments-list").prepend(data)
 
   setupEditForm: ->
-    $("#dorsale-comments-list").on "ajax:success", "form[id*=edit]", (e, data) ->
+    $(document).on "ajax:success", "form#edit-dorsale-comment", (e, data) ->
      $(this).replaceWith(data)
 
   setupEditButtons: ->
-    $("#dorsale-comments-list").on "click", "[href$=edit]", ->
+    $(document).on "click", "a.edit-dorsale-comment", ->
       container = $(this).parents(".comment")
       url       = this.href
 
@@ -30,12 +30,12 @@ window.dorsaleComments =
       return false
 
   setupDeleteButtons: ->
-    $("#dorsale-comments-list").on "ajax:success", "[data-method=delete]", ->
+    $(document).on "ajax:success", ".delete-dorsale-comment", ->
       $(this).parents(".comment").fadeOut ->
         $(this).remove()
 
   setupShowMoreLinks: ->
-    $("#dorsale-comments").on "click", ".comment-show_more", ->
+    $(document).on "click", ".comment-show_more", ->
       $(this).parents(".comment-text-truncated").remove()
       return false
 

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

@@ -1,4 +1,4 @@
-#dorsale-comments-list
+.dorsale-comments-list
   margin: 1em 0
 
 .comment

data/app/assets/stylesheets/dorsale/engines/customer_vault.sass

@@ -27,3 +27,25 @@
       right: 0
       width: 33.33%
       margin: 0
+
+  .event
+    @extend .well
+    box-shadow: none
+    padding: 0.5em
+    margin: 0.75em 0
+
+    .avatar
+      float: left
+      margin-right: 15px
+      height: 50px
+      width: 50px
+
+    .event-infos
+      font-size: 80%
+      @extend .text-muted
+
+    .event-person
+      font-weight: bold
+
+    p.event-text
+      margin: 1rem 0 0 65px

data/app/assets/stylesheets/dorsale/engines/flyboy.sass

@@ -59,6 +59,22 @@
   th.task-term,
     text-align: right
 
+  .task_reminder_fields,
+  .task_term_fields,
+    display: flex
+
+    > div
+      margin-right: 15px
+
+    label
+      line-height: 2.5em
+
+    input, select
+      width: auto
+
+    input[id$=duration]
+      width: 5em
+
   @media print
     #new_task_comment_tr
       display: none

data/app/controllers/dorsale/comments_controller.rb

@@ -13,6 +13,7 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
     authorize @comment, :create?
 
     if @comment.save
+      notify_attachable!(:create)
       render_comment
     else
       render_nothing
@@ -27,6 +28,7 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
     authorize @comment, :update?
 
     if @comment.update(comment_params_for_update)
+      notify_attachable!(:update)
       render_comment
     else
       render_form
@@ -36,7 +38,8 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
   def destroy
     authorize @comment, :delete?
 
-    @comment.destroy
+    @comment.destroy!
+    notify_attachable!(:delete)
 
     render_nothing
   end
@@ -109,4 +112,8 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
   def comment_params_for_update
     comment_params
   end
+
+  def notify_attachable!(action)
+    @comment.commentable.try(:receive_comment_notification, @comment, action)
+  end
 end

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

@@ -32,14 +32,9 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
   def activity
     authorize model, :list?
 
-    @people ||= scope
+    @events ||= policy_scope(::Dorsale::CustomerVault::Event)
 
-    @comments ||= policy_scope(::Dorsale::Comment)
-      .where("commentable_type LIKE ?", "%CustomerVault%")
-      .order("created_at DESC, id DESC")
-      .preload(:commentable, :author)
-
-    @comments = @comments.page(params[:page]).per(50)
+    @events = @events.page(params[:page]).per(50)
   end
 
   def new
@@ -62,6 +57,7 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
     @person ||= scope.new(person_params_for_create)
 
     if @person.save
+      generate_event!("create")
       flash[:notice] = t("messages.#{person_type.to_s.pluralize}.create_ok")
       redirect_to back_url
     else
@@ -91,6 +87,7 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
     authorize @person, :update?
 
     if @person.update(person_params_for_update)
+      generate_event!("update")
       flash[:notice] = t("messages.#{person_type.to_s.pluralize}.update_ok")
       redirect_to back_url
     else
@@ -207,4 +204,12 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
     person_params
   end
 
+  def generate_event!(action)
+    policy_scope(::Dorsale::CustomerVault::Event).create!(
+      :author => current_user,
+      :person => @person,
+      :action => action,
+    )
+  end
+
 end

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

@@ -55,6 +55,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
 
   def new
     @task ||= scope.new
+    @task.owner ||= current_user
     @task.taskable_guid = params[:taskable_guid]
 
     set_owners
@@ -129,9 +130,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
   def snooze
     authorize @task, :snooze?
 
-    @task.snooze
-
-    if @task.save
+    if @task.snoozer.snooze
       flash[:success] = t("messages.tasks.snooze_ok")
     else
       flash[:danger] = t("messages.tasks.snooze_error")
@@ -183,7 +182,10 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
       :description,
       :progress,
       :term,
-      :reminder,
+      :reminder_type,
+      :reminder_date,
+      :reminder_duration,
+      :reminder_unit,
       :owner_guid,
     ]
   end

data/app/helpers/dorsale/comments_helper.rb

@@ -1,8 +1,7 @@
 module Dorsale::CommentsHelper
-  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)
+  def comments_for(commentable)
+    comments    = policy_scope(::Dorsale::Comment).where(commentable: commentable)
+    new_comment = new_comment_for(commentable)
 
     render(
       :partial => "dorsale/comments/comments",
@@ -13,6 +12,10 @@ module Dorsale::CommentsHelper
     )
   end
 
+  def new_comment_for(commentable)
+    policy_scope(Dorsale::Comment).new(commentable: commentable, author: current_user)
+  end
+
   def truncate_comments_in_this_page?
     controller_name == "people"
   end

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

@@ -26,10 +26,11 @@ module Dorsale::Flyboy::ApplicationHelper
   end
 
   def task_color(task)
-    return "finished" if task.done
-    return "ontime"   if task.reminder > Time.zone.now.to_date
-    return "onalert"  if task.term     < Time.zone.now.to_date
-    return "onwarning"
+    return "finished"  if task.done
+    return "onalert"   if task.term < Time.zone.now.to_date
+    return "onwarning" if task.reminder_date && task.reminder_date < Time.zone.now.to_date
+    return "ontime"
+
   end
 
   def flyboy_status_for_filters_select
@@ -44,4 +45,48 @@ module Dorsale::Flyboy::ApplicationHelper
     policy_scope(User)
   end
 
+  def flyboy_reminder_types_for_select
+    {
+      Dorsale::Flyboy::Task.t("reminder_type.none")     => "",
+      Dorsale::Flyboy::Task.t("reminder_type.duration") => "duration",
+      Dorsale::Flyboy::Task.t("reminder_type.custom")   => "custom",
+    }
+  end
+
+  def flyboy_reminder_type_units_for_select
+    {
+      Dorsale::Flyboy::Task.t("reminder_unit.days")   => "days",
+      Dorsale::Flyboy::Task.t("reminder_unit.weeks")  => "weeks",
+      Dorsale::Flyboy::Task.t("reminder_unit.months") => "months",
+    }
+  end
+
+  def task_term_values_for_select
+    today     = Time.zone.now.to_date
+    tomorrow  = (Time.zone.now + 1.day).to_date
+    this_week = Time.zone.now.to_date.end_of_week
+    next_week = (Time.zone.now + 1.week).to_date.end_of_week
+
+    # Because today or tomorrow can be equal to this week
+    if @task.term == today
+      is_today = true
+    elsif @task.term == tomorrow
+      is_tomorrow = true
+    elsif @task.term == this_week
+      is_this_week = true
+    elsif @task.term == next_week
+      is_next_week = true
+    else
+      is_custom = true
+    end
+
+    [
+      [Dorsale::Flyboy::Task.t("term_value.today"),     today.to_s,     {selected: is_today}],
+      [Dorsale::Flyboy::Task.t("term_value.tomorrow"),  tomorrow.to_s,  {selected: is_tomorrow}],
+      [Dorsale::Flyboy::Task.t("term_value.this_week"), this_week.to_s, {selected: is_this_week}],
+      [Dorsale::Flyboy::Task.t("term_value.next_week"), next_week.to_s, {selected: is_next_week}],
+      [Dorsale::Flyboy::Task.t("term_value.custom"),    :custom,        {selected: is_custom}],
+    ]
+  end
+
 end

data/app/helpers/dorsale/users_helper.rb

@@ -8,4 +8,8 @@ module Dorsale::UsersHelper
       :title => user.to_s,
     )
   end
+
+  def default_avatar_url
+    "https://www.gravatar.com/avatar/?default=mm&size=200"
+  end
 end

data/app/models/dorsale/comment.rb

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

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

@@ -5,8 +5,8 @@ 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)
+  def self_and_related_events
+    ::Dorsale::CustomerVault::Event.where(person: [self] + individuals)
   end
 
   def name

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

@@ -0,0 +1,28 @@
+class Dorsale::CustomerVault::Event < ::Dorsale::ApplicationRecord
+  self.table_name = :dorsale_customer_vault_events
+
+  ACTIONS = %w(create update comment)
+
+  belongs_to :author,  class_name: User
+  belongs_to :person,  class_name: Dorsale::CustomerVault::Person
+  belongs_to :comment, class_name: Dorsale::Comment
+
+  validates :author,  presence: true
+  validates :person,  presence: true
+  validates :action,  presence: true, inclusion: {in: ACTIONS}
+  validates :comment, presence: true, if: proc { action == "comment" }
+
+  default_scope -> {
+    all
+      .order(created_at: :desc, id: :desc)
+      .preload(:author, :person, :comment)
+  }
+
+  def date
+    created_at.try(:to_date)
+  end
+
+  def text
+    t("text.#{action}")
+  end
+end

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

@@ -6,8 +6,8 @@ class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
   validates :last_name,  presence: true
   belongs_to :corporation
 
-  def self_and_related_comments
-    comments
+  def self_and_related_events
+    events
   end
 
   def name

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

@@ -23,6 +23,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   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 :events, dependent: :destroy
   has_many :invoices, class_name: ::Dorsale::BillingMachine::Invoice, as: :customer
   accepts_nested_attributes_for :address, allow_destroy: true
 
@@ -66,4 +67,16 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
     links.each(&:destroy!)
   end
 
+  def receive_comment_notification(comment, action)
+    if action == :create
+      scope = Pundit.policy_scope!(comment.author, ::Dorsale::CustomerVault::Event)
+      scope.create!(
+        :author  => comment.author,
+        :person  => self,
+        :comment => comment,
+        :action  => "comment",
+      )
+    end
+  end
+
 end