customer_vault 1.2.10 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7efac29df8356cfb56f63db45f21e89b34b8b0a
-  data.tar.gz: 41b656df007addd542dc17399d81f2fe18fbc206
+  metadata.gz: 3cffb6d371325082afdddc1baaa81b3bbb880f1d
+  data.tar.gz: 7241ff4944e3cd0b56dca447314c63006a9c03ee
 SHA512:
-  metadata.gz: d7081dd00fa99ec079eb0882248d9ac5448bd13c57c3a4b9fcf1990d47dafa15246d7ab14156a1d242e24f796ef73cf79ef9335e68ac5c517ef01331596dc858
-  data.tar.gz: 22fc2f5eee5721cbfd8d895c5161ee01d14678335ec1e29ac56fdbf129fd59bab937ebadbe20dd6b486424e964fc92329a57e3f9bd79c4020a5e3efc2db6648b
+  metadata.gz: 08396806b39b01ebb0ac0cc04dac6bb894303a6f448d53db2b29c40d1d5dacb9d193144e23a8505affcf9859e3a9d639d46f03ddca61997a52625c763472646d
+  data.tar.gz: 67eb70427f25da93f30cfb0e889683168331553869ba6e169ba6fd01622f20c1698cc585aea70588660c86327bc343fe4a7c27f22a455bd261ed83596af39f13

data/app/controllers/customer_vault/application_controller.rb

@@ -2,16 +2,12 @@ require "cancan"
 
 module CustomerVault
   class ApplicationController < ::ApplicationController
-    def current_ability
-      @current_ability ||= ::CustomerVault::Ability.new(nil)
-    end
-
     helper Dorsale::AllHelpers
 
     private
 
     def customer_vault_tag_list
-      ActsAsTaggableOn::Tag.all.map(&:to_s)
+      ActsAsTaggableOn::Tag.order(:name).map(&:to_s)
     end
   end
 end

data/app/controllers/customer_vault/corporations_controller.rb

@@ -2,12 +2,17 @@ require_dependency "customer_vault/application_controller"
 
 module CustomerVault
   class CorporationsController < ::CustomerVault::ApplicationController
+    handles_sortable_columns
     helper Dorsale::CommentsHelper
 
     before_action :set_corporation, only: [:show, :edit, :update, :destroy]
 
     def show
       authorize! :read, @corporation
+
+      @filters ||= Flyboy::SmallData::FilterForTasks.new(cookies)
+      @tasks = @corporation.tasks
+      @tasks = @filters.apply(@tasks)
     end
 
     def new

data/app/controllers/customer_vault/individuals_controller.rb

@@ -2,12 +2,17 @@ require_dependency "customer_vault/application_controller"
 
 module CustomerVault
   class IndividualsController < ::CustomerVault::ApplicationController
+    handles_sortable_columns
     helper Dorsale::CommentsHelper
 
     before_action :set_individual, only: [:show, :edit, :update, :destroy]
 
     def show
       authorize! :read, @individual
+
+      @filters ||= Flyboy::SmallData::FilterForTasks.new(cookies)
+      @tasks = @individual.tasks
+      @tasks = @filters.apply(@tasks)
     end
 
     def new

data/app/models/customer_vault/ability_helper.rb

@@ -0,0 +1,7 @@
+module CustomerVault
+  module AbilityHelper
+    def define_customer_vault_abilities
+      can [:list, :create, :read, :update, :delete], CustomerVault::Person
+    end
+  end
+end

data/app/models/customer_vault/corporation.rb

@@ -1,5 +1,3 @@
-require "dorsale/search"
-
 module CustomerVault
   class Corporation < Person
     self.table_name = 'customer_vault_corporations'

data/app/models/customer_vault/individual.rb

@@ -1,5 +1,3 @@
-require "dorsale/search"
-
 module CustomerVault
   class Individual < Person
     self.table_name = 'customer_vault_individuals'

data/app/models/customer_vault/person.rb

@@ -1,6 +1,7 @@
 module CustomerVault
   class Person < ActiveRecord::Base
     self.abstract_class = true
+    include Dorsale::PolymorphicId
 
     acts_as_taggable
 
@@ -10,6 +11,7 @@ module CustomerVault
 
     has_many :comments, -> { order("id DESC") }, class_name: "Dorsale::Comment", as: :commentable
     has_one :address, class_name: 'Dorsale::Address', as: :addressable, inverse_of: :addressable
+    has_many :tasks, class_name: "Flyboy::Task", as: :taskable
     accepts_nested_attributes_for :address, allow_destroy: true
 
     def self.list

data/app/views/customer_vault/corporations/{_show_details.html.slim → _context.html.slim}

@@ -1,21 +1,20 @@
+- corporation = corporation || taskable
+
 .corporation-context: .context
   = context_icon :users
   = context_title corporation.name
   = actions_for corporation, url: customer_vault.corporation_path(corporation)
 
-  = context_info corporation.class.human_attribute_name(:tags),  person_tags(corporation)
-  = context_info corporation.class.human_attribute_name(:email), corporation.email
-  = context_info corporation.class.human_attribute_name(:phone), corporation.phone
-  = context_info corporation.class.human_attribute_name(:fax),   corporation.fax
+  = context_info corporation.class.human_attribute_name(:tags),    person_tags(corporation)
+  = context_info corporation.class.human_attribute_name(:email),   email_link(corporation.email)
+  = context_info corporation.class.human_attribute_name(:phone),   tel_link(corporation.phone)
+  = context_info corporation.class.human_attribute_name(:fax),     tel_link(corporation.fax)
   = context_info corporation.class.human_attribute_name(:capital), corporation.capital.to_s
+
   = context_info corporation.class.human_attribute_name(:immatriculation_number_1), corporation.immatriculation_number_1
   = context_info corporation.class.human_attribute_name(:immatriculation_number_2), corporation.immatriculation_number_2
   = context_info corporation.class.human_attribute_name(:legal_form), corporation.legal_form
 
-  - if corporation.www.present?
-    - if corporation.www.to_s.include?("://")
-      = context_info corporation.class.human_attribute_name(:www), link_to(corporation.www, corporation.www)
-    - else
-      = context_info corporation.class.human_attribute_name(:www), link_to("http://#{corporation.www}", corporation.www)
+  = context_info corporation.class.human_attribute_name(:www), web_link(corporation.www)
 
   = context_info corporation.class.human_attribute_name(:address), corporation.address.one_line if corporation.address.present?

data/app/views/customer_vault/corporations/_list_details.html.slim

@@ -10,15 +10,11 @@
   .panel-body
     .row
       .col-md-6
-        = context_info c.class.human_attribute_name(:phone), c.phone
-        = context_info c.class.human_attribute_name(:fax),   c.fax
+        = context_info c.class.human_attribute_name(:phone), tel_link(c.phone)
+        = context_info c.class.human_attribute_name(:fax),   tel_link(c.fax)
 
       .col-md-6
-        = context_info c.class.human_attribute_name(:email), c.email
-        - if c.www.present?
-          - if c.www.to_s.include?("://")
-            = context_info c.class.human_attribute_name(:www), link_to(c.www, c.www)
-          - else
-            = context_info c.class.human_attribute_name(:www), link_to("http://#{c.www}", c.www)
+        = context_info c.class.human_attribute_name(:email), email_link(c.email)
+        = context_info c.class.human_attribute_name(:www),   web_link(c.www)
 
     = context_info c.class.human_attribute_name(:tags), person_tags(c)

data/app/views/customer_vault/individuals/{_show_details.html.slim → _context.html.slim}

@@ -1,19 +1,15 @@
+- individual = individual || taskable
+
 .individual-context: .context
   = context_icon :user
   = context_title individual.name
   = actions_for individual, url: customer_vault.individual_path(individual)
 
   = context_info individual.class.human_attribute_name(:tags),    person_tags(individual)
-  = context_info individual.class.human_attribute_name(:email),   individual.email
-  = context_info individual.class.human_attribute_name(:twitter), individual.twitter
-  = context_info individual.class.human_attribute_name(:phone),   individual.phone
-  = context_info individual.class.human_attribute_name(:mobile),  individual.mobile
-  = context_info individual.class.human_attribute_name(:fax),     individual.fax
-
-  - if individual.www.present?
-    - if individual.www.to_s.include?("://")
-      = context_info individual.class.human_attribute_name(:www), link_to(individual.www, individual.www)
-    - else
-      = context_info individual.class.human_attribute_name(:www), link_to("http://#{individual.www}", individual.www)
-
+  = context_info individual.class.human_attribute_name(:email),   email_link(individual.email)
+  = context_info individual.class.human_attribute_name(:twitter), twitter_link(individual.twitter)
+  = context_info individual.class.human_attribute_name(:phone),   tel_link(individual.phone)
+  = context_info individual.class.human_attribute_name(:mobile),  tel_link(individual.mobile)
+  = context_info individual.class.human_attribute_name(:fax),     tel_link(individual.fax)
+  = context_info individual.class.human_attribute_name(:www),     web_link(individual.www)
   = context_info individual.class.human_attribute_name(:address), individual.address.one_line if individual.address.present?

data/app/views/customer_vault/individuals/_list_details.html.slim

@@ -10,15 +10,11 @@
   .panel-body
     .row
       .col-md-6
-        = context_info i.class.human_attribute_name(:phone), i.phone
-        = context_info i.class.human_attribute_name(:mobile), i.mobile
+        = context_info i.class.human_attribute_name(:phone),  tel_link(i.phone)
+        = context_info i.class.human_attribute_name(:mobile), tel_link(i.mobile)
 
       .col-md-6
-        = context_info i.class.human_attribute_name(:email), i.email
-        - if i.www.present?
-          - if i.www.to_s.include?("://")
-            = context_info i.class.human_attribute_name(:www), link_to(i.www, i.www)
-          - else
-            = context_info i.class.human_attribute_name(:www), link_to("http://#{i.www}", i.www)
+        = context_info i.class.human_attribute_name(:email), email_link(i.email)
+        = context_info i.class.human_attribute_name(:www),   web_link(i.www)
 
     = context_info i.class.human_attribute_name(:tags), person_tags(i)

data/app/views/customer_vault/links/edit.html.slim

@@ -3,7 +3,7 @@
     = render "customer_vault/breadcrumb"
 
   - content_for :context do
-    = render partial: "customer_vault/people/show_details", locals: {person: @person}
+    = render partial: "customer_vault/people/context", locals: {person: @person}
 
   - content_for :main do
     .well

data/app/views/customer_vault/links/new.html.slim

@@ -3,7 +3,7 @@
     = render "customer_vault/breadcrumb"
 
   - content_for :context do
-    = render partial: "customer_vault/people/show_details", locals: {person: @person}
+    = render partial: "customer_vault/people/context", locals: {person: @person}
 
   - content_for :main do
     .well

data/app/views/customer_vault/people/_activity_tab.html.slim

@@ -6,8 +6,6 @@ hr
 - person.comments.map do |comment|
   = render "customer_vault/people/comment", comment: comment
 
-/ = comments_for(person)
-
-- if person.try(:context)
+- if person.try(:context).present?
   .well
     = text2html(person.context)

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

@@ -0,0 +1,4 @@
+- if person.instance_of? CustomerVault::Individual
+    = render partial: 'customer_vault/individuals/context', locals: {individual: person}
+- if person.instance_of? CustomerVault::Corporation
+    = render partial: 'customer_vault/corporations/context', locals: {corporation: person}

data/app/views/customer_vault/people/_show.html.slim

@@ -3,7 +3,7 @@
     = render "customer_vault/breadcrumb"
 
   - content_for :context
-    = render partial: "customer_vault/people/show_details", locals: {person: person}
+    = render partial: "customer_vault/people/context", locals: {person: person}
 
   - content_for :main
     ul.nav.nav-tabs role="tablist"

data/app/views/customer_vault/people/_tasks_tab.html.slim

@@ -1 +1,6 @@
-p = "Todos are soon to come"
+.flyboy
+  = render "flyboy/filters"
+  = render "flyboy/tasks/list", tasks: @tasks, nested: true
+
+  p.center
+    = link_to t("actions.new_task"), flyboy.new_task_path(taskable_guid: person.guid), class: "btn btn-success"

data/config/locales/fr.yml

@@ -18,6 +18,7 @@ fr:
     new_corporation: "Nouvelle entreprise"
     new_link: "Nouveau lien"
     new_comment: "Nouveau commentaire"
+    new_task: "Nouvelle tâche"
 
   activerecord:
     models:

data/lib/customer_vault/engine.rb

@@ -1,3 +1,7 @@
+require "dorsale"
+require "dorsale/search"
+require "dorsale/polymorphic_id"
+require "flyboy"
 require "handles_sortable_columns"
 require "acts-as-taggable-on"
 require "selectize-rails"

data/lib/customer_vault/version.rb

@@ -1,3 +1,3 @@
 module CustomerVault
-  VERSION = "1.2.10"
+  VERSION = "1.3.0"
 end

data/spec/dummy/app/assets/stylesheets/application.sass

@@ -1,3 +1,4 @@
 @import dorsale/all
 @import customer_vault/all
+@import flyboy/all
 @import selectize.bootstrap3

data/spec/dummy/app/controllers/application_controller.rb

@@ -2,4 +2,11 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  helper CustomerVault::ApplicationHelper
+  helper Flyboy::ApplicationHelper
+
+  def current_ability
+    @current_ability ||= Ability.new
+  end
 end

data/spec/dummy/app/models/ability.rb

@@ -0,0 +1,10 @@
+class Ability
+  include CanCan::Ability
+  include CustomerVault::AbilityHelper
+  include Flyboy::AbilityHelper
+
+  def initialize
+    define_customer_vault_abilities
+    define_flyboy_abilities
+  end
+end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  mount Dorsale::Engine       => "/dorsale"
   mount CustomerVault::Engine => "/customer_vault"
-  mount Dorsale::Engine => "/dorsale"
+  mount Flyboy::Engine        => "/flyboy"
 end

data/spec/dummy/db/migrate/20150525124034_create_flyboy_goals.flyboy.rb

@@ -0,0 +1,13 @@
+# This migration comes from flyboy (originally 20150331092103)
+class CreateFlyboyGoals < ActiveRecord::Migration
+  def change
+    create_table :flyboy_goals do |t|
+      t.string  :title
+      t.text    :description
+      t.integer :status
+      t.string  :tracking
+      t.integer :version
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150525124035_create_flyboy_tasks.flyboy.rb

@@ -0,0 +1,17 @@
+# This migration comes from flyboy (originally 20150331120335)
+class CreateFlyboyTasks < ActiveRecord::Migration
+  def change
+    create_table :flyboy_tasks do |t|
+      t.integer :goal_id
+      t.string  :title
+      t.text    :description
+      t.integer :progress, default: 0
+      t.boolean :done
+      t.date    :term
+      t.date    :reminder
+      t.integer :cost
+      t.integer :budget
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150525124036_create_flyboy_task_comments.flyboy.rb

@@ -0,0 +1,12 @@
+# This migration comes from flyboy (originally 20150331124858)
+class CreateFlyboyTaskComments < ActiveRecord::Migration
+  def change
+    create_table :flyboy_task_comments do |t|
+      t.integer  :task_id
+      t.datetime :date
+      t.text     :description
+      t.integer  :progress
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150525124037_states_to_string.flyboy.rb

@@ -0,0 +1,9 @@
+# This migration comes from flyboy (originally 20150407070804)
+class StatesToString < ActiveRecord::Migration
+  def change
+    change_column :flyboy_goals, :status, :string
+    Flyboy::Goal.where(status: "0").update_all(status: "pending")
+    Flyboy::Goal.where(status: "1").update_all(status: "open")
+    Flyboy::Goal.where(status: "2").update_all(status: "closed")
+  end
+end

data/spec/dummy/db/migrate/20150525124038_remove_tasks_cost_and_budget.flyboy.rb

@@ -0,0 +1,7 @@
+# This migration comes from flyboy (originally 20150409081956)
+class RemoveTasksCostAndBudget < ActiveRecord::Migration
+  def change
+    remove_column :flyboy_tasks, :cost
+    remove_column :flyboy_tasks, :budget
+  end
+end

data/spec/dummy/db/migrate/20150525124039_add_progress_to_goals.flyboy.rb

@@ -0,0 +1,7 @@
+# This migration comes from flyboy (originally 20150415130939)
+class AddProgressToGoals < ActiveRecord::Migration
+  def change
+    add_column :flyboy_goals, :progress, :integer
+    Flyboy::Goal.all.map(&:update_progress!)
+  end
+end

data/spec/dummy/db/migrate/20150525124040_tasks_belongs_to_taskable.flyboy.rb

@@ -0,0 +1,8 @@
+# This migration comes from flyboy (originally 20150525081421)
+class TasksBelongsToTaskable < ActiveRecord::Migration
+  def change
+    rename_column :flyboy_tasks, :goal_id, :taskable_id
+    add_column :flyboy_tasks, :taskable_type, :string
+    Flyboy::Task.update_all(taskable_type: Flyboy::Goal)
+  end
+end

data/spec/dummy/db/migrate/20150525124041_rename_title_to_name.flyboy.rb

@@ -0,0 +1,7 @@
+# This migration comes from flyboy (originally 20150525114120)
+class RenameTitleToName < ActiveRecord::Migration
+  def change
+    rename_column :flyboy_goals, :title, :name
+    rename_column :flyboy_tasks, :title, :name
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150520105439) do
+ActiveRecord::Schema.define(version: 20150525124041) do
 
   create_table "customer_vault_corporations", force: :cascade do |t|
     t.string   "name"
@@ -74,6 +74,39 @@ ActiveRecord::Schema.define(version: 20150520105439) do
     t.datetime "updated_at",       null: false
   end
 
+  create_table "flyboy_goals", force: :cascade do |t|
+    t.string   "name"
+    t.text     "description"
+    t.string   "status"
+    t.string   "tracking"
+    t.integer  "version"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+    t.integer  "progress"
+  end
+
+  create_table "flyboy_task_comments", force: :cascade do |t|
+    t.integer  "task_id"
+    t.datetime "date"
+    t.text     "description"
+    t.integer  "progress"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
+  create_table "flyboy_tasks", force: :cascade do |t|
+    t.integer  "taskable_id"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "progress",      default: 0
+    t.boolean  "done"
+    t.date     "term"
+    t.date     "reminder"
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.string   "taskable_type"
+  end
+
   create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"