dorsale 3.1.7 → 3.2.0

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

@@ -1,3 +1,3 @@
-#comments-list
+#dorsale-comments-list
   - comments.map do |comment|
     = render "dorsale/comments/comment", comment: comment

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

@@ -1 +1 @@
-= render "dorsale/comments/form"
+= render "dorsale/comments/form", comment: @comment

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

@@ -1,19 +1,15 @@
-.customer_vault
-  - content_for :context do
-    = render "dorsale/customer_vault/people/context", person: @person
+- content_for :person_page
+  .panel.panel-default
+    .panel-heading: .panel-title
+        = @link.t
+        = " : "
+        = @link.person
+        = " / "
+        = @link.other_person
 
-  - content_for :main do
-    .panel.panel-default
-      .panel-heading: .panel-title
-          = @link.t
-          = " : "
-          = @link.person
-          = " / "
-          = @link.other_person
+    .panel-body
+      = horizontal_form_for @link, as: :link, url: customer_vault_link_form_path do |f|
+        = f.input :title
+        = form_buttons
 
-      .panel-body
-        = horizontal_form_for @link, as: :link, url: customer_vault_link_form_path do |f|
-          = f.input :title
-          = form_buttons
-
-  = render_contextual
+= render "dorsale/customer_vault/people/show_layout"

data/app/views/dorsale/customer_vault/links/index.html.slim

@@ -0,0 +1,10 @@
+- content_for :person_page
+  .linkable
+    - @person.links.each do |link|
+      = render "dorsale/customer_vault/people/list_item", person: link.other_person, link: link
+
+  .text-center
+    - if policy(@person).update?
+      = create_button dorsale.new_customer_vault_person_link_path(@person), action: :new_link
+
+= render "dorsale/customer_vault/people/show_layout"

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

@@ -1,17 +1,13 @@
-.customer_vault
-  - content_for :context do
-    = render "dorsale/customer_vault/people/context", person: @person
+- content_for :person_page
+  .panel.panel-default
+    .panel-heading: .panel-title
+      = t("actions.new_link")
 
-  - content_for :main do
-    .panel.panel-default
-      .panel-heading: .panel-title
-        = t("actions.new_link")
+    .panel-body
+      = horizontal_form_for @link, as: :link, url: customer_vault_link_form_path do |f|
+        = f.association :bob, label: ::Dorsale::CustomerVault::Person.t
 
-      .panel-body
-        = horizontal_form_for @link, as: :link, url: customer_vault_link_form_path do |f|
-          = f.association :bob, label: ::Dorsale::CustomerVault::Person.t
+        = f.input :title
+        = form_buttons
 
-          = f.input :title
-          = form_buttons
-
-  = render_contextual
+= render "dorsale/customer_vault/people/show_layout"

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

@@ -2,5 +2,5 @@
   = create_button dorsale.new_customer_vault_individual_path, action: :new_individual
   = create_button dorsale.new_customer_vault_corporation_path, action: :new_corporation
 
-- if @people_without_pagination && policy(::Dorsale::CustomerVault::Person).export?
-  = download_button url_for(format: :xls), download: "people.xls"
+- if @people_without_pagination && policy(model).export?
+  = download_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"

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

@@ -8,7 +8,7 @@
     - person.tasks.where(done: false).map do |task|
       li.list-group-item
         a href=dorsale.flyboy_task_path(task)
-          = task.name
+          = task
 
         - if policy(task).complete?
           span.pull-right

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

@@ -1,6 +1,6 @@
 .index-tabs-container
   = nav class: "index-tabs" do
-    = link_to t("sections.activity"), url_for(action: :activity)
-    = link_to t("sections.people"),   url_for(action: :index)
+    = link_to t("customer_vault.activity"),      url_for(action: :activity)
+    = link_to Dorsale::CustomerVault::Person.ts, url_for(action: :index)
 
   = search_form action: url_for(action: :index)

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

@@ -0,0 +1,10 @@
+.customer_vault
+  - content_for :context
+    = render "dorsale/customer_vault/people/context", person: @person
+    = render "dorsale/customer_vault/people/data_context", person: @person
+
+  - content_for :main
+    = render "dorsale/customer_vault/people/tabs"
+    = content_for :person_page
+
+  = render_contextual

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

@@ -0,0 +1,24 @@
+.nav.nav-tabs#person-tabs
+  li class=("active" if request.path == dorsale.customer_vault_person_path(@person))
+    a href=dorsale.customer_vault_person_path(@person)
+      = t("customer_vault.activity")
+      = " "
+      span.badge = @person.comments.count
+
+  li class=("active" if request.path.start_with? dorsale.customer_vault_person_links_path(@person))
+    a href=dorsale.customer_vault_person_links_path(@person)
+      = Dorsale::CustomerVault::Link.ts
+      = " "
+      span.badge = @person.links.length
+
+  li class=("active" if request.path == dorsale.tasks_customer_vault_person_path(@person))
+    a href=dorsale.tasks_customer_vault_person_path(@person)
+      = Dorsale::Flyboy::Task.ts
+      = " "
+      span.badge = @person.tasks.count
+
+  li class=("active" if request.path == dorsale.invoices_customer_vault_person_path(@person))
+    a href=dorsale.invoices_customer_vault_person_path(@person)
+      = Dorsale::BillingMachine::Invoice.ts
+      = " "
+      span.badge = @person.invoices.count

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

@@ -15,9 +15,8 @@
       p = t("messages.no_activity")
 
     - else
-      #comments-list
-        - @comments.map do |comment|
-          = render "dorsale/customer_vault/people/comment", comment: comment
+      #dorsale-comments
+        = render "dorsale/comments/list", comments: @comments
 
   - content_for :pagination
     = paginate @comments

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

@@ -1,6 +1,7 @@
 .customer_vault
   - content_for :context
     = render "dorsale/customer_vault/people/context", person: @person
+    = render "dorsale/customer_vault/people/data_context", person: @person
 
   - content_for :main
     .panel.panel-default: .panel-heading: .panel-title

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

@@ -2,7 +2,7 @@
   - content_for :title
     = icon(:book)
     = " "
-    = ::Dorsale::CustomerVault::Person.ts
+    = model.ts
 
   - content_for :filters
     = render "dorsale/customer_vault/people/filters"
@@ -21,6 +21,6 @@
 
   - content_for :page_footer
     .text-center
-      = info ::Dorsale::CustomerVault::Person, :count, @people_without_pagination.count
+      = info model, :count, @people_without_pagination.count
 
   = render_dorsale_index

data/app/views/dorsale/customer_vault/people/index.xlsx.ruby

@@ -0,0 +1,49 @@
+fields = %w(
+  person_type
+  first_name
+  last_name
+  name
+  short_name
+  email
+  phone
+  mobile
+  fax
+  skype
+  www
+  twitter
+  facebook
+  linkedin
+  viadeo
+  legal_form
+  capital
+  immatriculation_number_1
+  immatriculation_number_2
+  european_union_vat_number
+  address.street
+  address.street_bis
+  address.city
+  address.zip
+  address.country
+)
+
+data = []
+
+data << fields.map { |field| model.t(field) }
+
+@people_without_pagination.each do |person|
+  line = []
+
+  fields.each do |field|
+    if field == "person_type"
+      line << person.class.t
+    elsif field.include?("address.")
+      line << person.address.public_send(field.gsub("address.", ""))
+    else
+      line << person.public_send(:try, field)
+    end
+  end
+
+  data << line
+end
+
+Dorsale::Serializers::XLSX.new(data).render_inline

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

@@ -0,0 +1,5 @@
+- content_for :person_page
+  .panel.panel-default
+    = render "dorsale/billing_machine/invoices/list", invoices: @person.invoices
+
+= render "dorsale/customer_vault/people/show_layout"

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

@@ -1,28 +1,7 @@
-.customer_vault
-  - content_for :context
-    = render "dorsale/customer_vault/people/context", person: @person
-    = render "dorsale/customer_vault/people/data_context", person: @person
+- content_for :person_page
+  = comments_for(@person)
 
-  - content_for :main
-    ul.nav.nav-tabs role="tablist"
-      li.active
-        a data-toggle="tab" href="#activity" role="tab"
-          = t("sections.activity")
-      li
-        a data-toggle="tab" href="#links" role="tab"
-          = t("sections.links")
-      li
-        a data-toggle="tab" href="#tasks" role="tab"
-          = t("sections.tasks")
+  - if @person.try(:context).present?
+    .panel.panel-default: .panel-body = text2html(@person.context)
 
-    .tab-content.person-tab-content
-      #activity.tab-pane.active
-        = render "dorsale/customer_vault/people/activity_tab", person: @person
-
-      #links.tab-pane
-        = render "dorsale/customer_vault/people/links_tab", person: @person
-
-      #tasks.tab-pane
-        = render "dorsale/customer_vault/people/tasks_tab", person: @person
-
-  = render_contextual
+= render "dorsale/customer_vault/people/show_layout"

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

@@ -0,0 +1,4 @@
+- content_for :person_page
+  = tasks_for(@person)
+
+= render "dorsale/customer_vault/people/show_layout"

data/app/views/dorsale/expense_gun/categories/_list.html.slim

@@ -14,14 +14,17 @@ table.table.default#category
     - @categories.each do |category|
       tr.actions.category
         td.actions.category-name
-          = category.name
+          = category
+
         td.actions.category-code
           = category.code
+
         td.actions.category-vat_deductible
           - if category.vat_deductible?
             = icon(:check)
           - else
             = icon(:remove)
+
         td.actions.category-action
           - if policy(category).create?
             = update_button edit_expense_gun_category_path(category), id: "edit-#{category.id}"

data/app/views/dorsale/expense_gun/expenses/_list.html.slim

@@ -7,7 +7,7 @@
         - if policy(expense).update?
           = update_button dorsale.edit_expense_gun_expense_path(expense)
 
-      .panel-title = expense.name
+      .panel-title = expense
 
     .panel-body
       .row

data/app/views/dorsale/expense_gun/expenses/show.html.slim

@@ -1,5 +1,5 @@
 .expense_gun
-  .actions.top.hidden-print
+  .actions.top
     - if policy(@expense).update?
       = update_button dorsale.edit_expense_gun_expense_path(@expense)
 
@@ -24,7 +24,7 @@
     .panel-heading: .panel-title
         = @expense.t
         = " : "
-        = @expense.name
+        = @expense
 
     .panel-body
       = info @expense, :date
@@ -61,5 +61,5 @@
 
   hr
 
-  .attachments-panel.hidden-print
+  .attachments-panel
     = attachments_for(@expense)

data/app/views/dorsale/flyboy/_filters.html.slim

@@ -1,2 +1,5 @@
 = filters_form do |f|
   = f.input :fb_status, collection: flyboy_status_for_filters_select, include_blank: false
+
+  - if @filters.class::STRATEGIES.include?("fb_owner")
+    = f.input :fb_owner, collection: flyboy_tasks_owners_for_filters_select, include_blank: t("filters.all_owners")

data/app/views/dorsale/flyboy/folders/_form.html.slim

@@ -3,7 +3,9 @@
     = icon :tasks
     = " "
     - if @folder.persisted?
-      = t("actions.update") + " : " + @folder.name
+      = t("actions.update")
+      = " : "
+      = @folder
     - else
       = t('messages.folders.title_create')
 

data/app/views/dorsale/flyboy/folders/_list.html.slim

@@ -32,9 +32,9 @@ table#folders-list
 
         td.folder-name
           - if policy(folder).read?
-            = link_to folder.name, dorsale.flyboy_folder_path(folder)
+            = link_to folder, dorsale.flyboy_folder_path(folder)
           - else
-            = folder.name
+            = folder
 
         td.actions
           - if policy(Dorsale::Flyboy::Task.new(taskable: folder)).create?

data/app/views/dorsale/flyboy/task_comments/_list.html.slim

@@ -10,7 +10,7 @@
 
     tbody
       - if policy(@task).update?
-        tr
+        tr#new_task_comment_tr
           td.task_comment-progress
             = f.input :progress, label: false
 
@@ -29,6 +29,6 @@
 
           td.task_comment-description
             p: small
-              span.date = l(comment.date)
+              span.date = date(comment.date)
 
             p = text2html comment.description

data/app/views/dorsale/flyboy/tasks/_form.html.slim

@@ -3,7 +3,10 @@
     = icon :check_square_o
     = " "
     - if @task.persisted?
-      = t("actions.update") + " : " + @task.name
+      = t("actions.update")
+      = " : "
+      = @task
+
     - else
       =  t('actions.new_task')
 

data/app/views/dorsale/flyboy/tasks/_list.html.slim

@@ -64,4 +64,4 @@ table#tasks-list
               = task.taskable.to_s
 
         td.task-term.hidden-xs
-          = l(task.term)
+          = date(task.term)

data/app/views/dorsale/flyboy/tasks/_summary_list.html.slim

@@ -1,17 +1,18 @@
-.task-group
-  h3 = title
+.panel.panel-default
+  .panel-heading: .panel-title = title
   table.default
     thead
       tr
         th.taskable = ::Dorsale::Flyboy::Task.t(:taskable)
         th.name     = ::Dorsale::Flyboy::Task.t
         th.date     = ::Dorsale::Flyboy::Task.t(:date)
+
     tbody
       - tasks.each do |task|
         tr
           td.taskable
             a href=engine_polymorphic_path(task.taskable)
-              = task.taskable.name
+              = task.taskable
 
           td.name
             - if task.owner.nil?
@@ -19,7 +20,7 @@
             - else
               = icon(:user)
 
-            = link_to task.name, dorsale.flyboy_task_path(task)
+            = link_to task, dorsale.flyboy_task_path(task)
 
           td.date
-            .text-muted = date(task.term)
+            .text-muted = date(task.term)