customer_vault 1.2.0 → 1.2.1

data/app/assets/stylesheets/customer_vault/application.sass

@@ -0,0 +1,75 @@
+@import dorsale/comments
+
+.individual-icon,
+.corporation-icon
+  font-size: 275%
+
+.individual,
+.corporation
+  h3
+    font-size: 100%
+    margin: 10px 0
+    font-weight: bold
+  
+  
+  p.infos strong
+    @extend .text-muted
+  
+  
+  .actions
+    width: 50%
+    margin: 0
+    padding: 0
+    float: right
+    text-align: right
+    
+    a
+      @extend .btn
+      @extend .btn-default
+      @extend .btn-xs
+      margin: 0 3px
+
+
+
+// TODO : Export to agilidee_commons
+
+.nostyle
+  margin: 0
+  padding: 0
+  border: none
+  outline: none
+  background: none
+
+.fa
+  @extend .fa-fw
+
+.tab-content 
+  border-left: 1px solid #ddd
+  border-right: 1px solid #ddd
+  border-bottom: 1px solid #ddd
+  padding: 10px
+  min-height: 300px
+
+.nav-tabs 
+  margin-bottom: 0
+
+.cadre
+  padding: 5px
+  margin-bottom: 10px
+  
+  background-color: #F5F5F5
+  border: 1px solid #D8D8D8
+  list-style: none
+
+.center 
+  text-align: center
+
+form .actions
+  text-align: center
+  
+  .btn
+    margin: 1em 5px
+
+h1
+  @extend .text-muted
+  text-align: center

data/app/controllers/customer_vault/corporations_controller.rb

@@ -2,14 +2,14 @@ require_dependency "customer_vault/application_controller"
 
 module CustomerVault
   class CorporationsController < ApplicationController
+    helper Dorsale::CommentsHelper
+    
     before_action :set_corporation, only: [:show, :edit, :update, :destroy]
 
-    # GET /corporations/1
     def show
       authorize! :read, @corporation
     end
 
-    # GET /corporations/new
     def new
       authorize! :create, CustomerVault::Corporation
       
@@ -17,14 +17,12 @@ module CustomerVault
       @corporation.build_address
     end
 
-    # GET /corporations/1/edit
     def edit
       authorize! :update, @corporation
       
       @corporation.build_address unless @corporation.address
     end
 
-    # POST /corporations
     def create
       authorize! :create, CustomerVault::Corporation
       
@@ -37,7 +35,6 @@ module CustomerVault
       end
     end
 
-    # PATCH/PUT /corporations/1
     def update
       authorize! :update, @corporation
       
@@ -48,7 +45,6 @@ module CustomerVault
       end
     end
 
-    # DELETE /corporations/1
     def destroy
       authorize! :delete, @corporation
       
@@ -57,15 +53,21 @@ module CustomerVault
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_corporation
-        @corporation = Corporation.find(params[:id])
-      end
+    
+    def set_corporation
+      @corporation = Corporation.find(params[:id])
+    end
+
+    def permitted_params
+      [
+        :name, :email, :phone, :fax,
+        :address_attributes => [:street, :street_bis, :zip, :city, :country]
+      ]
+    end
+
+    def corporation_params
+      params.require(:corporation).permit(permitted_params)
+    end
 
-      # Only allow a trusted parameter "white list" through.
-      def corporation_params
-        params.require(:corporation).permit(:name, :email, :phone, :fax,
-                                            :address_attributes => [:street, :street_bis, :zip, :city, :country])
-      end
   end
 end

data/app/controllers/customer_vault/individuals_controller.rb

@@ -2,14 +2,14 @@ require_dependency "customer_vault/application_controller"
 
 module CustomerVault
   class IndividualsController < ApplicationController
+    helper Dorsale::CommentsHelper
+    
     before_action :set_individual, only: [:show, :edit, :update, :destroy]
 
-    # GET /individuals/1
     def show
       authorize! :read, @individual
     end
 
-    # GET /individuals/new
     def new
       authorize! :create, CustomerVault::Individual
       
@@ -17,14 +17,12 @@ module CustomerVault
       @individual.build_address
     end
 
-    # GET /individuals/1/edit
     def edit
       authorize! :update, @individual
       
       @individual.build_address unless @individual.address
     end
 
-    # POST /individuals
     def create
       authorize! :create, CustomerVault::Individual
       
@@ -37,7 +35,6 @@ module CustomerVault
       end
     end
 
-    # PATCH/PUT /individuals/1
     def update
       authorize! :update, @individual
       
@@ -48,7 +45,6 @@ module CustomerVault
       end
     end
 
-    # DELETE /individuals/1
     def destroy
       authorize! :delete, @individual
       
@@ -57,16 +53,22 @@ module CustomerVault
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_individual
-        @individual = Individual.find(params[:id])
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      def individual_params
-        params.require(:individual).permit(:first_name, :last_name, :email, :title, 
-                                      :twitter, :www, :context, :phone, :fax, :mobile,
-                                      :address_attributes => [:street, :street_bis, :zip, :city, :country])
-      end
+    def set_individual
+      @individual = Individual.find(params[:id])
+    end
+
+    def permitted_params
+      [
+        :first_name, :last_name, :email, :title,
+        :twitter, :www, :context, :phone, :fax, :mobile,
+        :address_attributes => [:street, :street_bis, :zip, :city, :country]
+      ]
+    end
+
+    def individual_params
+      params.require(:individual).permit(permitted_params)
+    end
+
   end
 end

data/app/controllers/customer_vault/people_controller.rb

@@ -4,24 +4,31 @@ require 'handles_sortable_columns'
 module CustomerVault
   class PeopleController < ApplicationController
     handles_sortable_columns
-    before_action :set_individual, only: [:show, :edit, :update, :destroy]
     
     def index
       authorize! :list, Person
       
-      people = sortable_column_order do |column, direction|
+      sorted_people = sortable_column_order do |column, direction|
         case column
         when 'name'
-          (direction == :asc) ? Person.list.sort_by(&:name)
-                              : Person.list.sort_by(&:name).reverse
+          (direction == :asc) ? get_index_people.sort_by(&:name)
+                              : get_index_people.sort_by(&:name).reverse
         when 'zip'
-          (direction == :asc) ? Person.list.sort{|a,b| a.address.zip <=> b.address.zip}
-                              : Person.list.sort{|a,b| b.address.zip <=> a.address.zip}
+          (direction == :asc) ? get_index_people.sort_by{ |p| p.address.zip }
+                              : get_index_people.sort_by{ |p| p.address.zip }.reverse
         else
-          Person.list.sort_by(&:name)
+          get_index_people.sort_by(&:name)
         end
       end
-      @people= Kaminari.paginate_array(people).page(params[:page]).per(8)
+      
+      @people = Kaminari.paginate_array(sorted_people).page(params[:page]).per(8)
     end
+    
+    private
+    
+    def get_index_people
+      Individual.search(params[:q]) + Corporation.search(params[:q])
+    end
+    
   end
-end
+end

data/app/models/customer_vault/corporation.rb

@@ -1,7 +1,12 @@
+require "dorsale/search"
+
 module CustomerVault
   class Corporation < Person
     self.table_name = 'customer_vault_corporations'
-    validates_presence_of :name
+    
+    include Dorsale::Search
+    
+    validates :name, presence: true
     
   end
 end

data/app/models/customer_vault/individual.rb

@@ -1,12 +1,17 @@
+require "dorsale/search"
+
 module CustomerVault
   class Individual < Person
     self.table_name = 'customer_vault_individuals'
     
+    include Dorsale::Search
+    
+    validates :first_name, presence: true
+    validates :last_name,  presence: true
+    
     def name
       [self.last_name, self.first_name].join(', ')
     end
     
-    validates_presence_of :first_name
-    validates_presence_of :last_name
   end
 end

data/app/models/customer_vault/link.rb

@@ -1,6 +1,6 @@
 module CustomerVault
   class Link < ActiveRecord::Base
     belongs_to :alice, polymorphic: true
-    belongs_to :bob, polymorphic: true
+    belongs_to :bob,   polymorphic: true
   end
 end

data/app/models/customer_vault/person.rb

@@ -1,7 +1,8 @@
 module CustomerVault
   class Person < ActiveRecord::Base
     self.abstract_class = true
- 
+    
+    has_many :comments, class_name: "Dorsale::Comment", as: :commentable
     has_one :address, class_name: 'Dorsale::Address', as: :addressable
     accepts_nested_attributes_for :address, allow_destroy: true
 

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

@@ -1,29 +1,18 @@
 .row.corporation
-	.col-lg-1
-			.corporation-icon = icon :users
-			=link_to 'Details', [customer_vault, c] , :class=>"btn btn-success btn-xs"
-	.col-lg-11
-		.row.top-buffer
-			.col-lg-12 id='name'
-				span.bold.name #{c.name}
-				- if defined? link
-					= render partial: 'customer_vault/links/title', locals: {link: link, person: person}
-		.row
-				.col-lg-4 id='email'
-					-	if c.email?
-						span class= 'bold text-muted' Email: 
-						span class = 'text-muted bold' #{c.email}
-					-	else
-						span class = 'bold invisible' CACHEE
-				.col-lg-4 id='phone'
-					-	if c.phone?
-						span class= 'bold text-muted' Phone: 
-						span #{c.phone}
-					- else 
-						span class= 'bold invisible' CACHEE
-				.col-lg-4 id='fax'
-					- if c.fax?
-						span class= 'bold text-muted' Fax: 
-						span #{c.fax}
-					- else 
-						span class= 'bold invisible' CACHEE 	
+  .col-md-1.col-xs-2.center
+    .corporation-icon = icon :users
+    = link_to 'Details', [customer_vault, c], class: "btn btn-success btn-xs"
+  
+  .col-md-11.col-xs-10
+    h3.name
+      = c.name
+      
+      - if defined?(link)
+        = render partial: "customer_vault/links/title", locals: {link: link, person: person}
+    
+    .row
+      .col-md-6
+        = context_info "Phone", c.phone
+        = context_info "Fax",   c.fax
+      .col-md-6
+        = context_info "E-mail", c.email

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

@@ -1,41 +1 @@
-- content_for :sub_header do
-  ol.breadcrumb
-    li
-      = link_to 'Home', '/'
-    li
-      = link_to 'People', customer_vault.people_path
-    li.active
-      = @corporation.name
-
-- content_for :context do
-  = render partial: 'show_details', locals: {corporation: @corporation}
-
-- content_for :main do
-  ul.nav.nav-tabs role="tablist"
-      li.active
-        a data-toggle="tab" href="#linkable" role="tab" Links 
-      li
-        a data-toggle="tab" href="#history" role="tab" History
-      li
-        a data-toggle="tab" href="#todos" role="tab" Todos
-
-  .tab-content
-    #linkable.tab-pane.active
-      ul.linkable
-        - @corporation.links.each do |link|
-          li.person
-            - target = link[:person]
-            - if target.instance_of? CustomerVault::Individual
-                = render partial: 'customer_vault/individuals/list_details', :locals => {:i => target, person: @corporation, link: link[:origin]}
-            - if target.instance_of? CustomerVault::Corporation
-                = render partial: 'customer_vault/corporations/list_details', :locals => {:c => target, person: @corporation, link: link[:origin]}
-      
-      = link_to 'New link', customer_vault.new_corporation_link_path(@corporation.id), class: "btn btn-success", id: 'new-link'
-    
-    #history.tab-pane
-      p = "History is soon to come"
-    
-    #todos.tab-pane
-      p = "Todos are soon to come"
-
-= render "agilidee_commons/contextual"
+= render partial: "customer_vault/people/show", locals: {person: @corporation}

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

@@ -1,38 +1,23 @@
 .row.individual
-	.col-lg-1
-			.individual-icon = icon :user
-			=link_to 'Details', [customer_vault, i] , :class=>"btn btn-success btn-xs"
-	.col-lg-11
-		.row.top-buffer
-			.col-lg-12 id='name'
-				span.bold.name #{i.name}
-				- if defined? link
-					= render partial: 'customer_vault/links/title', locals: {link: link, person: person}
-		.row
-				.col-lg-4 id='email'
-					-	if i.email?
-						span class= 'bold text-muted' Email: 
-						span class = 'text-muted bold' #{i.email}
-					-	else
-						span class = 'bold invisible' CACHEE
-				.col-lg-4 id='phone'
-					-	if i.phone?
-						span class= 'bold text-muted' Phone: 
-						span #{i.phone}
-					- else 
-						span class= 'bold invisible' CACHEE
-				.col-lg-4 id='mobile'
-					- if i.mobile?
-						span class= 'bold text-muted' Mobile: 
-						span #{i.mobile}
-					- else 
-						span class= 'bold invisible' CACHEE 
-		.row
-			.col-lg-12 id='www'
-				-	if i.www?
-					-	if i.www.include?("http://")
-						=link_to i.www , i.www
-					- else 
-					 	=link_to "http://#{i.www}" , "http://#{i.www}"
-				-	else 
-					span class= 'bold invisible' CACHEE
+  .col-md-1.col-xs-2.center
+      .individual-icon = icon :user
+      = link_to 'Details', [customer_vault, i], class: "btn btn-success btn-xs"
+  
+  .col-md-11.col-xs-10
+    h3.name
+      = i.name
+      
+      - if defined?(link)
+        = render partial: 'customer_vault/links/title', locals: {link: link, person: person}
+    
+    .row
+      .col-md-6
+        = context_info "Phone",  i.phone
+        = context_info "Mobile", i.mobile
+      .col-md-6
+        = context_info "E-mail", i.email
+        - if i.www.present?
+          - if i.www.to_s.include?("://")
+            = context_info "Website", link_to(i.www, i.www)
+          - else
+            = context_info "Website", link_to("http://#{i.www}", i.www)