dorsale 3.1.7 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e8255c9d6c9efa78f99a3914f3ca347456faa10
-  data.tar.gz: c4bea5ce3821ec79e4fb8ff96fce60869cb49e2e
+  metadata.gz: 3238d078981accff66147d5fb412740e482a115f
+  data.tar.gz: bb228e445bec72569f5083bd8ea6322702ba8ebd
 SHA512:
-  metadata.gz: 66c316f9221bf01e9b47a8dccc5da0512b3e374c765cf11595104db3189e068df578814219bb2895fecb1b0cdebd13e28395a5161d5362c7b1887f7464340987
-  data.tar.gz: 4a5e092869742218f94c4bcbc126c63f644d41a0dbf130a7370cecddbbaa3e2c27457069ebdacab833d6f1e041190a613a6fd0d7b4a689bd2003365b46ee3626
+  metadata.gz: 45e05fc44b6d74b7f44becd523c8dd7c7d306a82479adf5e86e7c9a677dc2285ab8cd9b56a2d1f2f405427014dc21a0d959192659c5f797ce5bc0c0ac5979b6c
+  data.tar.gz: 5ffd84a943253a3e8fdb99a5adad1286e62299106b62f604074f6ff6e745f0efaf2879dba8266d5540b73438fb1bec7990e3991d19a26957d382c353a17c5779

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 3.2.0
+
+- Add print CSS
+- UUID friendly
+- Add missing indexes
+- Add `:default` option to `info` helper
+- Refactor
+- Add nilify_blanks gem
+- Add invoices chart
+- CustomerVault improvements + add invoices tab
+- Comments improvements
+- Remove tasks PDF and CSV export (XLSX still present)
+- Convert CSV exports to XLSX
+- XLSX Serializer improvements
+
 ## 3.1.7
 
 - Filters changes : get/set are now private

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

@@ -1,28 +1,22 @@
 window.dorsaleComments =
-  load: ->
-    $("#dorsale-comments").map ->
-      container = $(this)
-      url       = this.dataset.url
-
-      $.ajax
-        url: url
-        success: (data) ->
-          container.html(data)
-          dorsaleComments.setupCreateForm()
-          dorsaleComments.setupEditButtons()
-          dorsaleComments.setupDeleteButtons()
-
-  reload: ->
-    dorsaleComments.load()
+  setup: ->
+    dorsaleComments.setupCreateForm()
+    dorsaleComments.setupEditForm()
+    dorsaleComments.setupEditButtons()
+    dorsaleComments.setupDeleteButtons()
 
   setupCreateForm: ->
-    $("#dorsale-comments form[id*=new]").on("ajax:success", dorsaleComments.reload)
+    $("#dorsale-comments").on "ajax:success", "form[id*=new]", (e, data) ->
+      if data.length
+        $(this).find("textarea").val("")
+        $("#dorsale-comments-list").prepend(data)
 
   setupEditForm: ->
-    $("#dorsale-comments form[id*=edit]").on("ajax:success", dorsaleComments.reload)
+    $("#dorsale-comments-list").on "ajax:success", "form[id*=edit]", (e, data) ->
+     $(this).replaceWith(data)
 
   setupEditButtons: ->
-    $("#dorsale-comments [href$=edit]").click ->
+    $("#dorsale-comments-list").on "click", "[href$=edit]", ->
       container = $(this).parents(".comment")
       url       = this.href
 
@@ -30,9 +24,13 @@ window.dorsaleComments =
         url: url
         success: (data) ->
           container.replaceWith(data)
-          dorsaleComments.setupEditForm()
 
       return false
 
   setupDeleteButtons: ->
-    $("#dorsale-comments [data-method=delete]").on("ajax:success", dorsaleComments.reload)
+    $("#dorsale-comments-list").on "ajax:success", "[data-method=delete]", ->
+      $(this).parents(".comment").fadeOut ->
+        $(this).remove()
+
+$(document).on "turbolinks:load", ->
+  dorsaleComments.setup()

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

@@ -16,5 +16,5 @@ window.setupDatepickers = ->
       todayBtn: "linked"
       autoclose: true
 
-$(document).on "ready turbolinks:load page:load", ->
+$(document).on "turbolinks:load", ->
   setupDatepickers()

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

@@ -24,7 +24,7 @@ window.setupUploadInputs = (scope = document) ->
       label.html(label_value)
     input.change()
 
-$(document).on "ready turbolinks:load page:load", ->
+$(document).on "turbolinks:load", ->
   $("button.reset").click ->
     form = $(this).parents("form")
 

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

@@ -122,5 +122,5 @@ window.modal =
       .on("submit", modal._callbacks.forms)
 
 
-$(document).on "ready turbolinks:load page:load modal:open", ->
+$(document).on "turbolinks:load modal:open", ->
   modal.setup()

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

@@ -1,4 +1,4 @@
-$(document).on "ready turbolinks:load page:load", ->
+$(document).on "turbolinks:load", ->
   if window.location.hash
     activeTab = $('[href="' + window.location.hash + '"]')
     activeTab && activeTab.tab('show')

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

@@ -1,4 +1,4 @@
-$(document).on "ready turbolinks:load page:load", ->
+$(document).on "turbolinks:load", ->
   $("form:not([action*=filters]) select[multiple][name*=tag]").not(".select2-hidden-accessible").map ->
     placeholder = $(this).attr("placeholder")
 

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

@@ -1,3 +1,3 @@
-$(document).on "ready turbolinks:load page:load", ->
+$(document).on "turbolinks:load", ->
   $(".title-tooltip").map ->
     $(this).tooltip(html: this.title)

data/app/assets/javascripts/dorsale/dependencies.coffee

@@ -9,3 +9,5 @@
 //= require select2_locale_fr
 //= require bootstrap-datepicker/core
 //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr
+//= require Chart.bundle
+//= require chartkick

data/app/assets/javascripts/dorsale/engines/billing_machine.coffee

@@ -15,7 +15,7 @@ window.num2str = (num) ->
   num = parseFloat(num)
   accounting.formatNumber(num)
 
-$(document).on "ready turbolinks:load page:load cocoon:after-insert", ->
+$(document).on "turbolinks:load cocoon:after-insert", ->
   $("#billing_machine-form input.number").keyup ->
     total_excluding_taxes = 0.0
 

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

@@ -1,4 +1,4 @@
 @import dorsale/dependencies
 @import dorsale/common
 @import dorsale/engines
-
+@import dorsale/print

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

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

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

@@ -2,13 +2,16 @@
   @extend .well
   padding: 8px
   box-shadow: none
+  display: flex
 
   select,
   button,
   input,
   .form-control,
   .select2-container,
+  .btn + .btn,
     margin: 0 5px 0 0
+    max-width: 15em
 
   .form-group
     display: inline-block
@@ -16,13 +19,25 @@
     padding: 0
     margin: 0
 
-  .form-control
+  .form-control,
+    @extend .input-sm
     display: inline-block
     width: auto
 
+  .btn
+    @extend .btn-sm
+
   input[id*=date]
     width: 8em
 
   .select2-container
     display: inline-block !important
     width: 30em !important
+    height: 30px !important
+
+    .select2-selection
+      height: 28px !important
+      min-height: 0 !important
+
+    .select2-selection__choice
+      margin-top: 3px !important

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

@@ -21,6 +21,9 @@
 .fa
   @extend .fa-fw
 
+button .fa
+  width: auto
+
 img
   max-width: 100%
 

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

@@ -12,8 +12,8 @@
       .infos-container
         width: auto
 
-  .person-tab-content
-    padding: 1em 0
+  #person-tabs
+    margin-bottom: 1em
 
   .index-tabs-container
     position: relative

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

@@ -10,3 +10,6 @@
 
       > .col-md-4
         width: 33.33%
+
+    .attachments-panel
+      display: none

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

@@ -65,3 +65,7 @@
   td.task-term,
   th.task-term,
     text-align: right
+
+  @media print
+    #new_task_comment_tr
+      display: none

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

@@ -0,0 +1,73 @@
+@media print
+  html,
+  body,
+  #body,
+  #main,
+  #context,
+  #context-main,
+  .row,
+  div[class^=col],
+  thead *,
+  tfoot *,
+  th,
+    margin: 0 !important
+    padding: 0 !important
+    font-size: 11px !important
+    float: none !important
+    width: auto !important
+    height: auto !important
+
+  .panel-title,
+  .context-header,
+  thead *,
+  tfoot *,
+  th,
+    font-size: 12px !important
+    line-height: 12px !important
+
+  h1
+    font-size: 2em
+
+  .filters,
+  form.search,
+  .input-group-addon,
+  .btn,
+  .actions,
+  .actions + hr,
+  .navbar,
+  .nav,
+  .nav-tabs,
+  a[href]:after,
+    display: none !important
+
+  .panel,
+  .table,
+  .list-group,
+  .well,
+  hr,
+  p,
+    margin: 1em 0 !important
+
+  .panel table,
+  .well p,
+  td p,
+    margin: 0 !important
+
+  .well,
+    padding: 0.5em !important
+
+  .panel-heading,
+  .panel-title,
+  .panel-body,
+  .panel-footer,
+  .context-header,
+  .context-body,
+  .context-footer,
+  .list-group-item,
+  thead tr > *,
+  tfoot tr > *,
+    padding: 0.5em !important
+    margin: 0 !important
+
+  .panel-heading .panel-title,
+    padding: 0 !important

data/app/controllers/dorsale/alexandrie/attachments_controller.rb

@@ -70,10 +70,6 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     ::Dorsale::Alexandrie::Attachment
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def set_objects
     @attachment = scope.find(params[:id])
   end

data/app/controllers/dorsale/application_controller.rb

@@ -13,4 +13,16 @@ class Dorsale::ApplicationController < ::ApplicationController
     end
   }
 
+  def model
+    raise NotImplementedError
+  end
+
+  helper_method :model
+
+  def scope
+    policy_scope(model)
+  end
+
+  helper_method :scope
+
 end

data/app/controllers/dorsale/billing_machine/application_controller.rb

@@ -7,12 +7,7 @@ class Dorsale::BillingMachine::ApplicationController < ::Dorsale::ApplicationCon
     raise "#euros is not available in BillingMachine, please use #bm_currency instead"
   end
 
-  def bm_currency(n)
-    DH.currency(n, ::Dorsale::BillingMachine.default_currency)
-  end
-
   helper_method :euros
-  helper_method :bm_currency
 
   def set_common_variables
     @payment_terms ||= policy_scope(::Dorsale::BillingMachine::PaymentTerm)

data/app/controllers/dorsale/billing_machine/id_cards_controller.rb

@@ -51,10 +51,6 @@ class Dorsale::BillingMachine::IdCardsController < ::Dorsale::BillingMachine::Ap
     ::Dorsale::BillingMachine::IdCard
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def back_url
     url_for(action: :index, id: nil)
   end

data/app/controllers/dorsale/billing_machine/invoices_controller.rb

@@ -140,10 +140,6 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     ::Dorsale::BillingMachine::Invoice
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def default_back_url
     if @invoice
       url_for(action: :show, id: @invoice.to_param)

data/app/controllers/dorsale/billing_machine/payment_terms_controller.rb

@@ -51,10 +51,6 @@ class Dorsale::BillingMachine::PaymentTermsController < ::Dorsale::BillingMachin
     ::Dorsale::BillingMachine::PaymentTerm
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def back_url
     url_for(action: :index, id: nil)
   end

data/app/controllers/dorsale/billing_machine/quotations_controller.rb

@@ -113,10 +113,6 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     ::Dorsale::BillingMachine::Quotation
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def default_back_url
     if @quotation
       url_for(action: :show, id: @quotation.to_param)

data/app/controllers/dorsale/comments_controller.rb

@@ -7,29 +7,16 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
 
   layout false
 
-  def index
-    @comment     = scope.new(comment_params_for_create)
-    @commentable = @comment.commentable
-    @comments    = scope
-      .where(commentable: @commentable)
-      .preload(:commentable, :author)
-
-    authorize @commentable, :read?
-  end
-
   def create
     @comment ||= scope.new(comment_params_for_create)
-    @commentable = @comment.commentable
 
     authorize @comment, :create?
 
     if @comment.save
-      flash[:success] = t("messages.comments.create_ok")
+      render_comment
     else
-      flash[:danger] = t("messages.comments.create_error")
+      render_nothing
     end
-
-    render_or_redirect
   end
 
   def edit
@@ -40,37 +27,39 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
     authorize @comment, :update?
 
     if @comment.update(comment_params_for_update)
-      flash[:notice] = t("messages.comments.update_ok")
+      render_comment
     else
-      flash[:alert] = t("messages.comments.update_error")
+      render_form
     end
-
-    render_or_redirect
   end
 
   def destroy
     authorize @comment, :delete?
 
-    if @comment.destroy
-      flash[:notice] = t("messages.comments.delete_ok")
-    else
-      flash[:alert] = t("messages.comments.delete_error")
-    end
+    @comment.destroy
 
-    render_or_redirect
+    render_nothing
   end
 
   private
 
-  def back_url
-    [
-      params[:form_url],
-      request.referer,
-      (main_app.root_path rescue "/"),
-    ].select(&:present?).first
+  def render_comment
+    if request.xhr?
+      render partial: "comment", locals: {comment: @comment}
+    else
+      redirect_to back_url
+    end
   end
 
-  def render_or_redirect
+  def render_form
+    if request.xhr?
+      render partial: "form", locals: {comment: @comment}
+    else
+      redirect_to back_url
+    end
+  end
+
+  def render_nothing
     if request.xhr?
       head :ok
     else
@@ -78,12 +67,16 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
     end
   end
 
-  def model
-    ::Dorsale::Comment
+  def back_url
+    [
+      params[:form_url],
+      request.referer,
+      (main_app.root_path rescue "/"),
+    ].select(&:present?).first
   end
 
-  def scope
-    policy_scope(model)
+  def model
+    ::Dorsale::Comment
   end
 
   def set_objects
@@ -109,28 +102,10 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
   end
 
   def comment_params_for_create
-    comment_params.merge(
-      :author      => current_user,
-      :commentable => find_commentable,
-    )
+    comment_params.merge(author: current_user)
   end
 
   def comment_params_for_update
     comment_params
   end
-
-  def commentable_type
-    params[:commentable_type] || @comment.commentable_type
-  end
-
-  def commentable_id
-    params[:commentable_id] || @comment.commentable_id
-  end
-
-  def find_commentable
-    commentable_type.to_s.constantize.find(commentable_id)
-  rescue NameError
-    raise ActiveRecord::RecordNotFound
-  end
-
 end