dorsale 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3238d078981accff66147d5fb412740e482a115f
-  data.tar.gz: bb228e445bec72569f5083bd8ea6322702ba8ebd
+  metadata.gz: d434a4d088da9d112016b8b105a585e3c6ab6d5d
+  data.tar.gz: 8e168b8193bba3d7ed57847a461feebd36b3e0d8
 SHA512:
-  metadata.gz: 45e05fc44b6d74b7f44becd523c8dd7c7d306a82479adf5e86e7c9a677dc2285ab8cd9b56a2d1f2f405427014dc21a0d959192659c5f797ce5bc0c0ac5979b6c
-  data.tar.gz: 5ffd84a943253a3e8fdb99a5adad1286e62299106b62f604074f6ff6e745f0efaf2879dba8266d5540b73438fb1bec7990e3991d19a26957d382c353a17c5779
+  metadata.gz: c7ab336441e22590d30bc06da433455fddfed6579cce0ab693f59bb243e073ebfd1ec29afdb631373abcea83b3cd650edb05c0a4f0dbc8e99742a03702d380d5
+  data.tar.gz: 8d4c15c6f3adf0c3a0375f451e03643f8a0b415ab33195e0dd862a7da9ae89ed8ba961b9c2bdfcfd7f5fb57fdc9c4241270cd93513aac610ece2d7f8ca14b72d

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## Next version
+
+Nothing.
+
+## 3.3.0
+
+- Add download of all invoices in pdf
+- Rename `render_dorsale_index` to `render_dorsale_page`
+- Replace `render_contextual` by `render_dorsale_page`
+- Change some view/partial names
+- Fix js reset button
+- Print CSS add flash
+
 ## 3.2.0
 
 - Add print CSS

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

@@ -27,20 +27,9 @@ window.setupUploadInputs = (scope = document) ->
 $(document).on "turbolinks:load", ->
   $("button.reset").click ->
     form = $(this).parents("form")
-
-    form.find("select option:first-child").map ->
-      this.selected = true
-
-    form.find("input").map ->
-      return if this.type.match(/submit|hidden|button/)
-      this.value = $(this).data("default-value") || ""
-
-    form.find("textarea").map ->
-      this.value = $(this).data("default-value") || ""
-
-    form.find("select").map ->
-      this.selectize.clear() if this.selectize
-      $(this).val("").trigger("change")
+    form.find("input, textarea, select").map ->
+      return if String(this.type).match(/submit|hidden|button/)
+      $(this).val String($(this).data("default-value") || "")
 
   # Referer with anchor
   $("form").submit ->

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

@@ -27,28 +27,5 @@
       margin-right: auto
       padding: 0 0.25em
 
-
-.actions.top
-  text-align: right
-  margin: 1em 0
-
-  .btn
-    @extend .btn
-
-  a.btn[href*='/new']
-    @extend .btn-success
-
-  .btn-primary
-    @extend .btn-primary
-
-  .btn-success
-    @extend .btn-success
-
-  .btn-danger
-    @extend .btn-danger
-
-  .btn-warning
-    @extend .btn-warning
-
 form.search
   margin: 1em 0

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

@@ -39,3 +39,8 @@ img.avatar
 
 .well
   box-shadow: none
+
+.panel-title .btn-xs,
+.panel-title .label,
+  position: relative
+  top: -2px

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

@@ -46,6 +46,9 @@
     display: inline-block
     margin: 0.5em 0.75em
 
+  .panel-title .label
+    margin: 0 0 0 1.5em
+
 
 #billing_machine-form,
 #billing_machine-show,

data/app/assets/stylesheets/dorsale/print.sass

@@ -38,6 +38,7 @@
   .nav,
   .nav-tabs,
   a[href]:after,
+  #flash,
     display: none !important
 
   .panel,

data/app/helpers/dorsale/button_helper.rb

@@ -65,6 +65,24 @@ module Dorsale::ButtonHelper
     dorsale_button(url, options)
   end
 
+  def export_button(url, options = {})
+    ext = url.split(".").last
+
+    if ext.length <= 4
+      action = :"export_#{ext}"
+    else
+      action = :export
+    end
+
+    options = {
+      :icon     => "cloud-download",
+      :action   => action,
+      :download => url,
+    }.merge(options)
+
+    dorsale_button(url, options)
+  end
+
   def update_button(url, options = {})
     options = {
       :icon   => :pencil,

data/app/helpers/dorsale/context_helper.rb

@@ -16,11 +16,7 @@ module Dorsale::ContextHelper
     }
   end
 
-  def render_contextual
-    render "dorsale/contextual"
-  end
-
-  def render_dorsale_index
-    render "dorsale/index"
+  def render_dorsale_page
+    render "dorsale/page"
   end
 end

data/app/views/dorsale/_page.html.slim

@@ -0,0 +1,40 @@
+#page_header = content_for(:page_header)
+
+- if content_for(:search)
+  .row
+    .col-md-8
+    .col-md-4
+      = content_for(:search)
+
+= content_for(:filters)
+
+- content_for(:main)
+  = content_for(:tabs)
+
+  - unless content_for?(:title)
+    p.text-right = content_for(:actions)
+
+  - if content_for?(:title) || content_for?(:table)
+    .panel.panel-default
+      - if content_for?(:title)
+        .panel-heading: .panel-title
+          = content_for(:title)
+          .pull-right = content_for(:actions)
+
+      = content_for(:table)
+
+  = content_for(:page_body)
+
+- if content_for?(:context)
+  .row
+    aside#context.col-sm-4.col-xs-12
+      = content_for(:context)
+    #context-main.col-sm-8.col-xs-12
+      = content_for(:main)
+- else
+  = content_for(:main)
+
+
+= content_for(:pagination)
+
+#page_footer = content_for(:page_footer)

data/app/views/dorsale/billing_machine/id_cards/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::BillingMachine::IdCard).create?
+  = create_button new_billing_machine_id_card_path, action: :create

data/app/views/dorsale/billing_machine/id_cards/index.html.slim

@@ -3,10 +3,9 @@
     = ::Dorsale::BillingMachine::IdCard.ts
 
   - content_for :actions
-    - if policy(::Dorsale::BillingMachine::IdCard).create?
-      = create_button new_billing_machine_id_card_path, action: :create
+    = render "dorsale/billing_machine/id_cards/index_actions"
 
   - content_for :table
     = render "dorsale/billing_machine/id_cards/list", id_cards: @id_cards
 
-  = render_dorsale_index
+  = render_dorsale_page

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

@@ -2,20 +2,6 @@
 - document_type = document.class.to_s.split("::").last.downcase.to_sym
 
 #billing_machine-show
-  h1
-    = document.t
-    - if document.tracking_id.present?
-      = " n° "
-      = document.tracking_id
-
-    - if document_type == :invoice
-      .label class="invoice #{document.payment_status}"
-        = document.t("payment_status.#{document.payment_status}")
-
-    - if document_type == :quotation
-      .label class="quotation #{quotation_state_classes(document)}"
-        = document.t("state.#{document.state}")
-
   .row
     .col-md-6
       .well

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

@@ -0,0 +1,6 @@
+- if policy(::Dorsale::BillingMachine::Invoice).create?
+  = create_button dorsale.new_billing_machine_invoice_path
+
+- if policy(::Dorsale::BillingMachine::Invoice).export?
+  = export_button dorsale.billing_machine_invoices_path(format: :xlsx), download: "#{model.ts}.xlsx"
+  = export_button dorsale.billing_machine_invoices_path(format: :pdf),  download: "#{model.ts}.pdf"

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

@@ -0,0 +1,12 @@
+= document.t
+- if document.tracking_id.present?
+  = " n° "
+  = document.tracking_id
+
+- if document.is_a?(Dorsale::BillingMachine::Invoice)
+  .label class="invoice #{document.payment_status}"
+    = document.t("payment_status.#{document.payment_status}")
+
+- if document.is_a?(Dorsale::BillingMachine::Quotation)
+  .label class="quotation #{quotation_state_classes(document)}"
+    = document.t("state.#{document.state}")

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

@@ -11,11 +11,7 @@
     = Dorsale::BillingMachine::Invoice.ts
 
   - content_for :actions
-    - if policy(::Dorsale::BillingMachine::Invoice).create?
-      = create_button dorsale.new_billing_machine_invoice_path
-
-    - if policy(::Dorsale::BillingMachine::Invoice).export?
-      = download_button dorsale.billing_machine_invoices_path(format: :xlsx), download: "#{model.ts}.xlsx"
+    = render "dorsale/billing_machine/invoices/index_actions"
 
   - content_for :table
     = render "dorsale/billing_machine/invoices/list", invoices: @invoices
@@ -23,4 +19,4 @@
   - content_for :pagination
     = paginate @invoices
 
-  = render_dorsale_index
+  = render_dorsale_page

data/app/views/dorsale/billing_machine/invoices/index.pdf.ruby

@@ -0,0 +1,5 @@
+pdf = CombinePDF.new
+@invoices_without_pagination.each do |invoice|
+  pdf << CombinePDF.parse(invoice.to_pdf)
+end
+pdf.to_pdf

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

@@ -1,7 +1,11 @@
 .billing_machine
-  .actions.top
+  - content_for :title
+    = render "dorsale/billing_machine/invoices/show_title", document: @invoice
+
+  - content_for :actions
     = render "dorsale/billing_machine/invoices/show_actions"
 
-  hr
+  - content_for :page_body
+    = render "dorsale/billing_machine/invoices/details", document: @invoice
 
-  = render "dorsale/billing_machine/invoices/details", document: @invoice
+  = render_dorsale_page

data/app/views/dorsale/billing_machine/payment_terms/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::BillingMachine::PaymentTerm).create?
+  = create_button new_billing_machine_payment_term_path, action: :create

data/app/views/dorsale/billing_machine/payment_terms/index.html.slim

@@ -3,10 +3,9 @@
     = ::Dorsale::BillingMachine::PaymentTerm.ts
 
   - content_for :actions
-    - if policy(::Dorsale::BillingMachine::PaymentTerm).create?
-      = create_button new_billing_machine_payment_term_path, action: :create
+    = render "dorsale/billing_machine/payment_terms/index_actions"
 
   - content_for :table
     = render "dorsale/billing_machine/payment_terms/list", payment_terms: @payment_terms
 
-  = render_dorsale_index
+  = render_dorsale_page

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

@@ -0,0 +1 @@
+= render "dorsale/billing_machine/invoices/details", document: document

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

@@ -0,0 +1,2 @@
+- if policy(Dorsale::BillingMachine::Quotation).create?
+  = create_button dorsale.new_billing_machine_quotation_path

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

@@ -0,0 +1 @@
+= render "dorsale/billing_machine/invoices/show_title", document: document

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

@@ -11,8 +11,7 @@
     = Dorsale::BillingMachine::Quotation.ts
 
   - content_for :actions
-    - if policy(Dorsale::BillingMachine::Quotation).create?
-      = create_button dorsale.new_billing_machine_quotation_path
+    = render "dorsale/billing_machine/quotations/index_actions"
 
   - content_for :table
     = render "dorsale/billing_machine/quotations/list", quotations: @quotations
@@ -20,4 +19,4 @@
   - content_for :pagination
     = paginate @quotations
 
-  = render_dorsale_index
+  = render_dorsale_page

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

@@ -1,8 +1,11 @@
 .billing_machine
-  .actions.top
-    = render "dorsale/billing_machine/quotations/show_actions"
+  - content_for :title
+    = render "dorsale/billing_machine/quotations/show_title", document: @quotation
 
-  hr
+  - content_for :actions
+    = render "dorsale/billing_machine/quotations/show_actions"
 
-  = render "dorsale/billing_machine/invoices/details", document: @quotation
+  - content_for :page_body
+    = render "dorsale/billing_machine/quotations/details", document: @quotation
 
+  = render_dorsale_page

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

@@ -1,4 +1,4 @@
-- content_for :person_page
+- content_for :page_body
   .panel.panel-default
     .panel-heading: .panel-title
         = @link.t

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

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

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

@@ -1,4 +1,4 @@
-- content_for :person_page
+- content_for :page_body
   .panel.panel-default
     .panel-heading: .panel-title
       = t("actions.new_link")

data/app/views/dorsale/customer_vault/people/{_actions.html.slim → _index_actions.html.slim}

@@ -3,4 +3,4 @@
   = create_button dorsale.new_customer_vault_corporation_path, action: :new_corporation
 
 - if @people_without_pagination && policy(model).export?
-  = download_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"
+  = export_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"

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

@@ -3,8 +3,7 @@
     = 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
+  - content_for :tabs
+    = render "dorsale/customer_vault/people/show_tabs"
 
-  = render_contextual
+  = render_dorsale_page

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

@@ -0,0 +1,26 @@
+.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
+
+  - if policy(Dorsale::Flyboy::Task).list?
+    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
+
+  - if policy(Dorsale::BillingMachine::Invoice).list?
+    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

@@ -5,10 +5,10 @@
     = t("customer_vault.activity")
 
   - content_for :actions
-    = render "dorsale/customer_vault/people/actions"
+    = render "dorsale/customer_vault/people/index_actions"
 
   - content_for :page_header
-  = render "dorsale/customer_vault/people/index_tabs"
+    = render "dorsale/customer_vault/people/index_tabs"
 
   - content_for :page_body
     - if @comments.empty?
@@ -21,4 +21,4 @@
   - content_for :pagination
     = paginate @comments
 
-  = render_dorsale_index
+  = render_dorsale_page